sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Merge branch 'for-next/at91'

This commit is contained in:
Sascha Hauer 2015-03-06 08:33:57 +01:00
parent 6bcfcece08 6c2a1c6769
commit e9fe7ecc5f
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/mach-at91/include/mach/cpu.h
View File

@ -48,6 +48,10 @@
#define ARCH_EXID_AT91SAM9G25 0x00000003
#define ARCH_EXID_AT91SAM9X25 0x00000004
#define ARCH_EXID_AT91SAM9N12 0x00000006
#define ARCH_EXID_AT91SAM9CN11 0x00000009
#define ARCH_EXID_AT91SAM9CN12 0x00000005
#define ARCH_EXID_SAMA5D3 0x00004300
#define ARCH_EXID_SAMA5D31 0x00444300
#define ARCH_EXID_SAMA5D33 0x00414300
@ -113,6 +117,9 @@ enum at91_soc_subtype {
AT91_SOC_SAM9G15, AT91_SOC_SAM9G35, AT91_SOC_SAM9X35,
AT91_SOC_SAM9G25, AT91_SOC_SAM9X25,
/* SAM9N12 */
AT91_SOC_SAM9CN11, AT91_SOC_SAM9CN12,
/* SAMA5D3 */
AT91_SOC_SAMA5D31, AT91_SOC_SAMA5D33, AT91_SOC_SAMA5D34,
AT91_SOC_SAMA5D35, AT91_SOC_SAMA5D36,

17
arch/arm/mach-at91/setup.c
View File

@ -156,6 +156,20 @@ static void __init soc_detect(u32 dbgu_base)
}
}
if (at91_soc_initdata.type == AT91_SOC_SAM9N12) {
switch (at91_soc_initdata.exid) {
case ARCH_EXID_AT91SAM9N12:
at91_soc_initdata.subtype = AT91_SOC_SAM9N12;
break;
case ARCH_EXID_AT91SAM9CN11:
at91_soc_initdata.subtype = AT91_SOC_SAM9CN11;
break;
case ARCH_EXID_AT91SAM9CN12:
at91_soc_initdata.subtype = AT91_SOC_SAM9CN12;
break;
}
}
if (at91_soc_initdata.type == AT91_SOC_SAMA5D3) {
switch (at91_soc_initdata.exid) {
case ARCH_EXID_SAMA5D31:
@ -229,6 +243,9 @@ static const char *soc_subtype_name[] = {
[AT91_SOC_SAM9X35] = "at91sam9x35",
[AT91_SOC_SAM9G25] = "at91sam9g25",
[AT91_SOC_SAM9X25] = "at91sam9x25",
[AT91_SOC_SAM9N12] = "at91sam9n12",
[AT91_SOC_SAM9CN11] = "at91sam9cn11",
[AT91_SOC_SAM9CN12] = "at91sam9cn12",
[AT91_SOC_SAMA5D31] = "sama5d31",
[AT91_SOC_SAMA5D33] = "sama5d33",
[AT91_SOC_SAMA5D34] = "sama5d34",