Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+12
+9
arch/arm/mach-at91/include/mach/cpu.h
+9
arch/arm/mach-at91/include/mach/cpu.h
···
25
25
#define ARCH_ID_AT91SAM9G20 0x019905a0
26
26
#define ARCH_ID_AT91SAM9RL64 0x019b03a0
27
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
30
#define ARCH_ID_AT91CAP9 0x039A03A0
29
31
30
32
#define ARCH_ID_AT91SAM9XE128 0x329973a0
···
41
39
static inline unsigned long at91_cpu_identify(void)
42
40
{
43
41
return (at91_sys_read(AT91_DBGU_CIDR) & ~AT91_CIDR_VERSION);
42
+
}
43
+
44
+
static inline unsigned long at91_cpu_fully_identify(void)
45
+
{
46
+
return at91_sys_read(AT91_DBGU_CIDR);
44
47
}
45
48
46
49
#define ARCH_EXID_AT91SAM9M11 0x00000001
···
125
118
126
119
#ifdef CONFIG_ARCH_AT91SAM9G45
127
120
#define cpu_is_at91sam9g45() (at91_cpu_identify() == ARCH_ID_AT91SAM9G45)
121
+
#define cpu_is_at91sam9g45es() (at91_cpu_fully_identify() == ARCH_ID_AT91SAM9G45ES)
128
122
#else
129
123
#define cpu_is_at91sam9g45() (0)
124
+
#define cpu_is_at91sam9g45es() (0)
130
125
#endif
131
126
132
127
#ifdef CONFIG_ARCH_AT91CAP9
+3
arch/avr32/mach-at32ap/include/mach/cpu.h
+3
arch/avr32/mach-at32ap/include/mach/cpu.h