diff options
author | Josh Wu <josh.wu@atmel.com> | 2013-02-18 16:29:03 +0800 |
---|---|---|
committer | Josh Wu <josh.wu@atmel.com> | 2013-02-18 18:28:27 +0800 |
commit | e272b2540d5f8d95b532149fd2b8525397ccf5f7 (patch) | |
tree | c08007384c10b4c16d9a8fc815ae391d2da24290 | |
parent | ff67db8b4b6f18c1db6130be53c3ec011486528d (diff) |
sama5d3: Use correct chip name for functions that get cpu types.
-rw-r--r-- | arch/arm/cpu/armv7/at91/sama5d3_devices.c | 16 | ||||
-rw-r--r-- | arch/arm/include/asm/arch-at91/sama5d3.h | 38 |
2 files changed, 27 insertions, 27 deletions
diff --git a/arch/arm/cpu/armv7/at91/sama5d3_devices.c b/arch/arm/cpu/armv7/at91/sama5d3_devices.c index bd6a70b6cdc..5066182a796 100644 --- a/arch/arm/cpu/armv7/at91/sama5d3_devices.c +++ b/arch/arm/cpu/armv7/at91/sama5d3_devices.c @@ -45,32 +45,32 @@ unsigned int has_emac() { - return cpu_is_at91sama5d31() || cpu_is_at91sama5d35(); + return cpu_is_sama5d31() || cpu_is_sama5d35(); } unsigned int has_gmac() { - return !cpu_is_at91sama5d31(); + return !cpu_is_sama5d31(); } unsigned int has_lcdc() { - return !cpu_is_at91sama5d35(); + return !cpu_is_sama5d35(); } char *get_cpu_name() { unsigned int extension_id = get_extension_chip_id(); - if (cpu_is_at91sama5()) + if (cpu_is_sama5d3()) switch (extension_id) { - case ARCH_EXID_AT91SAMA5D31: + case ARCH_EXID_SAMA5D31: return CONFIG_SYS_AT91_D31_CPU_NAME; - case ARCH_EXID_AT91SAMA5D33: + case ARCH_EXID_SAMA5D33: return CONFIG_SYS_AT91_D33_CPU_NAME; - case ARCH_EXID_AT91SAMA5D34: + case ARCH_EXID_SAMA5D34: return CONFIG_SYS_AT91_D34_CPU_NAME; - case ARCH_EXID_AT91SAMA5D35: + case ARCH_EXID_SAMA5D35: return CONFIG_SYS_AT91_D35_CPU_NAME; default: return CONFIG_SYS_AT91_UNKNOWN_CPU; diff --git a/arch/arm/include/asm/arch-at91/sama5d3.h b/arch/arm/include/asm/arch-at91/sama5d3.h index 27dfffc895b..3071a373a7c 100644 --- a/arch/arm/include/asm/arch-at91/sama5d3.h +++ b/arch/arm/include/asm/arch-at91/sama5d3.h @@ -75,22 +75,22 @@ #define ATMEL_ID_FUSE 48 #define ATMEL_ID_MPDDRC 49 -/* sama5 series chip id definitions */ -#define ARCH_ID_AT91SAMA5 0x8a5c07c0 -#define ARCH_EXID_AT91SAMA5D31 0x00444300 -#define ARCH_EXID_AT91SAMA5D33 0x00414300 -#define ARCH_EXID_AT91SAMA5D34 0x00414301 -#define ARCH_EXID_AT91SAMA5D35 0x00584300 +/* sama5d3 series chip id definitions */ +#define ARCH_ID_SAMA5D3 0x8a5c07c0 +#define ARCH_EXID_SAMA5D31 0x00444300 +#define ARCH_EXID_SAMA5D33 0x00414300 +#define ARCH_EXID_SAMA5D34 0x00414301 +#define ARCH_EXID_SAMA5D35 0x00584300 -#define cpu_is_at91sama5() (get_chip_id() == ARCH_ID_AT91SAMA5) -#define cpu_is_at91sama5d31() (cpu_is_at91sama5() && \ - (get_extension_chip_id() == ARCH_EXID_AT91SAMA5D31)) -#define cpu_is_at91sama5d33() (cpu_is_at91sama5() && \ - (get_extension_chip_id() == ARCH_EXID_AT91SAMA5D33)) -#define cpu_is_at91sama5d34() (cpu_is_at91sama5() && \ - (get_extension_chip_id() == ARCH_EXID_AT91SAMA5D34)) -#define cpu_is_at91sama5d35() (cpu_is_at91sama5() && \ - (get_extension_chip_id() == ARCH_EXID_AT91SAMA5D35)) +#define cpu_is_sama5d3() (get_chip_id() == ARCH_ID_SAMA5D3) +#define cpu_is_sama5d31() (cpu_is_sama5d3() && \ + (get_extension_chip_id() == ARCH_EXID_SAMA5D31)) +#define cpu_is_sama5d33() (cpu_is_sama5d3() && \ + (get_extension_chip_id() == ARCH_EXID_SAMA5D33)) +#define cpu_is_sama5d34() (cpu_is_sama5d3() && \ + (get_extension_chip_id() == ARCH_EXID_SAMA5D34)) +#define cpu_is_sama5d35() (cpu_is_sama5d3() && \ + (get_extension_chip_id() == ARCH_EXID_SAMA5D35)) /* * User Peripherals physical base addresses. @@ -198,10 +198,10 @@ /* * Cpu Name */ -#define CONFIG_SYS_AT91_D31_CPU_NAME "AT91SAMA5D31" -#define CONFIG_SYS_AT91_D33_CPU_NAME "AT91SAMA5D33" -#define CONFIG_SYS_AT91_D34_CPU_NAME "AT91SAMA5D34" -#define CONFIG_SYS_AT91_D35_CPU_NAME "AT91SAMA5D35" +#define CONFIG_SYS_AT91_D31_CPU_NAME "SAMA5D31" +#define CONFIG_SYS_AT91_D33_CPU_NAME "SAMA5D33" +#define CONFIG_SYS_AT91_D34_CPU_NAME "SAMA5D34" +#define CONFIG_SYS_AT91_D35_CPU_NAME "SAMA5D35" #define CONFIG_SYS_AT91_UNKNOWN_CPU "Unknown CPU type" /* |