diff options
author | Josh Wu <josh.wu@atmel.com> | 2013-11-06 05:01:11 -0500 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2013-12-10 12:56:14 -0500 |
commit | 7f457160dae592b71b4aac03258237b0f2a67a3e (patch) | |
tree | 369ea3967c70c277a2f7d9b6eb19aa503e9c9e6c /arch/arm | |
parent | b8969ef5cfa7859dbe6ac74debfd2d884d9fe14c (diff) |
ARM: at91: sama5d3: add support for sama5d36 chip
The SAMA5D36 chip is the superset product of SAMA5D3x family.
For detail information please refer to:
http://www.atmel.com/Microsite/sama5d3/default.aspx
Signed-off-by: Josh Wu <josh.wu@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-at91/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/cpu.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-at91/setup.c | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 699b71e7f7ec..44eacdd7468b 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig | |||
@@ -67,7 +67,7 @@ config SOC_SAMA5D3 | |||
67 | select HAVE_AT91_DBGU1 | 67 | select HAVE_AT91_DBGU1 |
68 | help | 68 | help |
69 | Select this if you are using one of Atmel's SAMA5D3 family SoC. | 69 | Select this if you are using one of Atmel's SAMA5D3 family SoC. |
70 | This support covers SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35. | 70 | This support covers SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35, SAMA5D36. |
71 | endif | 71 | endif |
72 | 72 | ||
73 | if SOC_SAM_V4_V5 | 73 | if SOC_SAM_V4_V5 |
diff --git a/arch/arm/mach-at91/include/mach/cpu.h b/arch/arm/mach-at91/include/mach/cpu.h index d3d7b993846b..86c71debab5b 100644 --- a/arch/arm/mach-at91/include/mach/cpu.h +++ b/arch/arm/mach-at91/include/mach/cpu.h | |||
@@ -53,6 +53,7 @@ | |||
53 | #define ARCH_EXID_SAMA5D33 0x00414300 | 53 | #define ARCH_EXID_SAMA5D33 0x00414300 |
54 | #define ARCH_EXID_SAMA5D34 0x00414301 | 54 | #define ARCH_EXID_SAMA5D34 0x00414301 |
55 | #define ARCH_EXID_SAMA5D35 0x00584300 | 55 | #define ARCH_EXID_SAMA5D35 0x00584300 |
56 | #define ARCH_EXID_SAMA5D36 0x00004301 | ||
56 | 57 | ||
57 | #define ARCH_FAMILY_AT91X92 0x09200000 | 58 | #define ARCH_FAMILY_AT91X92 0x09200000 |
58 | #define ARCH_FAMILY_AT91SAM9 0x01900000 | 59 | #define ARCH_FAMILY_AT91SAM9 0x01900000 |
@@ -105,7 +106,7 @@ enum at91_soc_subtype { | |||
105 | 106 | ||
106 | /* SAMA5D3 */ | 107 | /* SAMA5D3 */ |
107 | AT91_SOC_SAMA5D31, AT91_SOC_SAMA5D33, AT91_SOC_SAMA5D34, | 108 | AT91_SOC_SAMA5D31, AT91_SOC_SAMA5D33, AT91_SOC_SAMA5D34, |
108 | AT91_SOC_SAMA5D35, | 109 | AT91_SOC_SAMA5D35, AT91_SOC_SAMA5D36, |
109 | 110 | ||
110 | /* No subtype for this SoC */ | 111 | /* No subtype for this SoC */ |
111 | AT91_SOC_SUBTYPE_NONE, | 112 | AT91_SOC_SUBTYPE_NONE, |
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c index 094b3459c288..eb6468dc60d5 100644 --- a/arch/arm/mach-at91/setup.c +++ b/arch/arm/mach-at91/setup.c | |||
@@ -233,6 +233,9 @@ static void __init soc_detect(u32 dbgu_base) | |||
233 | case ARCH_EXID_SAMA5D35: | 233 | case ARCH_EXID_SAMA5D35: |
234 | at91_soc_initdata.subtype = AT91_SOC_SAMA5D35; | 234 | at91_soc_initdata.subtype = AT91_SOC_SAMA5D35; |
235 | break; | 235 | break; |
236 | case ARCH_EXID_SAMA5D36: | ||
237 | at91_soc_initdata.subtype = AT91_SOC_SAMA5D36; | ||
238 | break; | ||
236 | } | 239 | } |
237 | } | 240 | } |
238 | } | 241 | } |
@@ -275,6 +278,7 @@ static const char *soc_subtype_name[] = { | |||
275 | [AT91_SOC_SAMA5D33] = "sama5d33", | 278 | [AT91_SOC_SAMA5D33] = "sama5d33", |
276 | [AT91_SOC_SAMA5D34] = "sama5d34", | 279 | [AT91_SOC_SAMA5D34] = "sama5d34", |
277 | [AT91_SOC_SAMA5D35] = "sama5d35", | 280 | [AT91_SOC_SAMA5D35] = "sama5d35", |
281 | [AT91_SOC_SAMA5D36] = "sama5d36", | ||
278 | [AT91_SOC_SUBTYPE_NONE] = "None", | 282 | [AT91_SOC_SUBTYPE_NONE] = "None", |
279 | [AT91_SOC_SUBTYPE_UNKNOWN] = "Unknown", | 283 | [AT91_SOC_SUBTYPE_UNKNOWN] = "Unknown", |
280 | }; | 284 | }; |