Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e7498281d3caec1141d7542ec494c4e4a1d404c9
Commit:     e7498281d3caec1141d7542ec494c4e4a1d404c9
Parent:     31143d5d515ece617ffccb7df5ff75e4d1dfa120
Author:     Haavard Skinnemoen <[EMAIL PROTECTED]>
AuthorDate: Wed May 9 02:33:47 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Wed May 9 12:30:50 2007 -0700

    Use common cpu_is_xxx() macros on AT91 and AVR32
    
    Several drivers shared between AT91 and AVR32 chips use cpu_is_xxx()
    to handle CPU-specific differences. Currently, such code needs to be
    inside #ifdef CONFIG_ARCH_AT91 because the macros don't exist on AVR32.
    
    By defining the same macros on both AT91 and AVR32, these #ifdefs can
    be eliminated. Since the macros will evaluate to a constant value for
    CPUs that aren't supported by the current architecture, any code that
    is only needed on AT91 will be optimized away on AVR32 and vice versa.
    
    Signed-off-by: Haavard Skinnemoen <[EMAIL PROTECTED]>
    Cc: David Brownell <[EMAIL PROTECTED]>
    Acked-by: Andrew Victor <[EMAIL PROTECTED]>
    Cc: Nicolas Ferre <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 include/asm-arm/arch-at91/cpu.h     |    6 ++++++
 include/asm-avr32/arch-at32ap/cpu.h |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 0 deletions(-)

diff --git a/include/asm-arm/arch-at91/cpu.h b/include/asm-arm/arch-at91/cpu.h
index d464ca5..7ef4eeb 100644
--- a/include/asm-arm/arch-at91/cpu.h
+++ b/include/asm-arm/arch-at91/cpu.h
@@ -68,4 +68,10 @@ static inline unsigned long at91_arch_identify(void)
 #define cpu_is_at91sam9263()   (0)
 #endif
 
+/*
+ * Since this is ARM, we will never run on any AVR32 CPU. But these
+ * definitions may reduce clutter in common drivers.
+ */
+#define cpu_is_at32ap7000()    (0)
+
 #endif
diff --git a/include/asm-avr32/arch-at32ap/cpu.h 
b/include/asm-avr32/arch-at32ap/cpu.h
new file mode 100644
index 0000000..2bdc5bd
--- /dev/null
+++ b/include/asm-avr32/arch-at32ap/cpu.h
@@ -0,0 +1,33 @@
+/*
+ * AVR32 and (fake) AT91 CPU identification
+ *
+ * Copyright (C) 2007 Atmel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef __ASM_ARCH_CPU_H
+#define __ASM_ARCH_CPU_H
+
+/*
+ * Only AT32AP7000 is defined for now. We can identify the specific
+ * chip at runtime, but I'm not sure if it's really worth it.
+ */
+#ifdef CONFIG_CPU_AT32AP7000
+# define cpu_is_at32ap7000()   (1)
+#else
+# define cpu_is_at32ap7000()   (0)
+#endif
+
+/*
+ * Since this is AVR32, we will never run on any AT91 CPU. But these
+ * definitions may reduce clutter in common drivers.
+ */
+#define cpu_is_at91rm9200()    (0)
+#define cpu_is_at91sam9xe()    (0)
+#define cpu_is_at91sam9260()   (0)
+#define cpu_is_at91sam9261()   (0)
+#define cpu_is_at91sam9263()   (0)
+
+#endif /* __ASM_ARCH_CPU_H */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to