Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2941054 authored by Nicolas Ferre's avatar Nicolas Ferre Committed by Russell King
Browse files

ARM: 6056/1: AT91: at91sam9g10 chip identification changed 



A bit in the at91sam9g10 identification number changed between Engineering
Sample and final product. This patch will identify both as being at91sam9g10.

Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: default avatarAndrew Victor <linux@maxim.org.za>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 67be0b8d

arch/arm/mach-at91/include/mach/cpu.h

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#define ARCH_ID_AT91SAM9260	0x019803a0

#define ARCH_ID_AT91SAM9261	0x019703a0

#define ARCH_ID_AT91SAM9263	0x019607a0

#define ARCH_ID_AT91SAM9G10	0x819903a0

#define ARCH_ID_AT91SAM9G10	0x019903a0

#define ARCH_ID_AT91SAM9G20	0x019905a0

#define ARCH_ID_AT91SAM9RL64	0x019b03a0

#define ARCH_ID_AT91SAM9G45	0x819b05a0
@@ -108,7 +108,7 @@ static inline unsigned long at91cap9_rev_identify(void) 
#endif



#ifdef CONFIG_ARCH_AT91SAM9G10

#define cpu_is_at91sam9g10()	(at91_cpu_identify() == ARCH_ID_AT91SAM9G10)

#define cpu_is_at91sam9g10()	((at91_cpu_identify() & ~AT91_CIDR_EXT)	== ARCH_ID_AT91SAM9G10)

#else

#define cpu_is_at91sam9g10()	(0)

#endif