diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-03 14:15:25 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-03 14:15:25 -0500 |
commit | 79051db9aedf7d169458a879accd1beda8f0cf8b (patch) | |
tree | 5fc7d94ed307dc5d31babc1cc802ccf3fb04507c | |
parent | 9ddfd92909ac969758684e309e62198f549786a3 (diff) | |
parent | d8951adeba05719b9efd7ce875a3294ffdbb37ea (diff) |
Merge branch 'for-linus' of git://github.com/at91linux/linux-2.6-at91
* 'for-linus' of git://github.com/at91linux/linux-2.6-at91:
at91: at91sam9g45 family: identify several chip versions
avr32: add two new at91 to cpu.h definition
-rw-r--r-- | arch/arm/mach-at91/include/mach/cpu.h | 9 | ||||
-rw-r--r-- | arch/avr32/mach-at32ap/include/mach/cpu.h | 3 |
2 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/include/mach/cpu.h b/arch/arm/mach-at91/include/mach/cpu.h index 34a9502c48bc..c22df30ed5e5 100644 --- a/arch/arm/mach-at91/include/mach/cpu.h +++ b/arch/arm/mach-at91/include/mach/cpu.h | |||
@@ -25,6 +25,8 @@ | |||
25 | #define ARCH_ID_AT91SAM9G20 0x019905a0 | 25 | #define ARCH_ID_AT91SAM9G20 0x019905a0 |
26 | #define ARCH_ID_AT91SAM9RL64 0x019b03a0 | 26 | #define ARCH_ID_AT91SAM9RL64 0x019b03a0 |
27 | #define ARCH_ID_AT91SAM9G45 0x819b05a0 | 27 | #define ARCH_ID_AT91SAM9G45 0x819b05a0 |
28 | #define ARCH_ID_AT91SAM9G45MRL 0x819b05a2 /* aka 9G45-ES2 & non ES lots */ | ||
29 | #define ARCH_ID_AT91SAM9G45ES 0x819b05a1 /* 9G45-ES (Engineering Sample) */ | ||
28 | #define ARCH_ID_AT91CAP9 0x039A03A0 | 30 | #define ARCH_ID_AT91CAP9 0x039A03A0 |
29 | 31 | ||
30 | #define ARCH_ID_AT91SAM9XE128 0x329973a0 | 32 | #define ARCH_ID_AT91SAM9XE128 0x329973a0 |
@@ -41,6 +43,11 @@ static inline unsigned long at91_cpu_identify(void) | |||
41 | return (at91_sys_read(AT91_DBGU_CIDR) & ~AT91_CIDR_VERSION); | 43 | return (at91_sys_read(AT91_DBGU_CIDR) & ~AT91_CIDR_VERSION); |
42 | } | 44 | } |
43 | 45 | ||
46 | static inline unsigned long at91_cpu_fully_identify(void) | ||
47 | { | ||
48 | return at91_sys_read(AT91_DBGU_CIDR); | ||
49 | } | ||
50 | |||
44 | #define ARCH_EXID_AT91SAM9M11 0x00000001 | 51 | #define ARCH_EXID_AT91SAM9M11 0x00000001 |
45 | #define ARCH_EXID_AT91SAM9M10 0x00000002 | 52 | #define ARCH_EXID_AT91SAM9M10 0x00000002 |
46 | #define ARCH_EXID_AT91SAM9G45 0x00000004 | 53 | #define ARCH_EXID_AT91SAM9G45 0x00000004 |
@@ -118,8 +125,10 @@ static inline unsigned long at91cap9_rev_identify(void) | |||
118 | 125 | ||
119 | #ifdef CONFIG_ARCH_AT91SAM9G45 | 126 | #ifdef CONFIG_ARCH_AT91SAM9G45 |
120 | #define cpu_is_at91sam9g45() (at91_cpu_identify() == ARCH_ID_AT91SAM9G45) | 127 | #define cpu_is_at91sam9g45() (at91_cpu_identify() == ARCH_ID_AT91SAM9G45) |
128 | #define cpu_is_at91sam9g45es() (at91_cpu_fully_identify() == ARCH_ID_AT91SAM9G45ES) | ||
121 | #else | 129 | #else |
122 | #define cpu_is_at91sam9g45() (0) | 130 | #define cpu_is_at91sam9g45() (0) |
131 | #define cpu_is_at91sam9g45es() (0) | ||
123 | #endif | 132 | #endif |
124 | 133 | ||
125 | #ifdef CONFIG_ARCH_AT91CAP9 | 134 | #ifdef CONFIG_ARCH_AT91CAP9 |
diff --git a/arch/avr32/mach-at32ap/include/mach/cpu.h b/arch/avr32/mach-at32ap/include/mach/cpu.h index 44d0bfa1f409..9c96a130f3a8 100644 --- a/arch/avr32/mach-at32ap/include/mach/cpu.h +++ b/arch/avr32/mach-at32ap/include/mach/cpu.h | |||
@@ -31,5 +31,8 @@ | |||
31 | #define cpu_is_at91sam9263() (0) | 31 | #define cpu_is_at91sam9263() (0) |
32 | #define cpu_is_at91sam9rl() (0) | 32 | #define cpu_is_at91sam9rl() (0) |
33 | #define cpu_is_at91cap9() (0) | 33 | #define cpu_is_at91cap9() (0) |
34 | #define cpu_is_at91sam9g10() (0) | ||
35 | #define cpu_is_at91sam9g45() (0) | ||
36 | #define cpu_is_at91sam9g45es() (0) | ||
34 | 37 | ||
35 | #endif /* __ASM_ARCH_CPU_H */ | 38 | #endif /* __ASM_ARCH_CPU_H */ |