diff options
Diffstat (limited to 'arch/arm/mach-at91/setup.c')
-rw-r--r-- | arch/arm/mach-at91/setup.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c index af6086b69bb1..b6a903410b92 100644 --- a/arch/arm/mach-at91/setup.c +++ b/arch/arm/mach-at91/setup.c | |||
@@ -22,12 +22,9 @@ | |||
22 | #include <mach/cpu.h> | 22 | #include <mach/cpu.h> |
23 | #include <mach/at91_dbgu.h> | 23 | #include <mach/at91_dbgu.h> |
24 | 24 | ||
25 | #include "soc.h" | ||
26 | #include "generic.h" | 25 | #include "generic.h" |
27 | #include "pm.h" | 26 | #include "pm.h" |
28 | 27 | ||
29 | struct at91_init_soc __initdata at91_boot_soc; | ||
30 | |||
31 | struct at91_socinfo at91_soc_initdata; | 28 | struct at91_socinfo at91_soc_initdata; |
32 | EXPORT_SYMBOL(at91_soc_initdata); | 29 | EXPORT_SYMBOL(at91_soc_initdata); |
33 | 30 | ||
@@ -60,7 +57,6 @@ static void __init soc_detect(u32 dbgu_base) | |||
60 | at91_soc_initdata.type = AT91_SOC_RM9200; | 57 | at91_soc_initdata.type = AT91_SOC_RM9200; |
61 | if (at91_soc_initdata.subtype == AT91_SOC_SUBTYPE_UNKNOWN) | 58 | if (at91_soc_initdata.subtype == AT91_SOC_SUBTYPE_UNKNOWN) |
62 | at91_soc_initdata.subtype = AT91_SOC_RM9200_BGA; | 59 | at91_soc_initdata.subtype = AT91_SOC_RM9200_BGA; |
63 | at91_boot_soc = at91rm9200_soc; | ||
64 | break; | 60 | break; |
65 | 61 | ||
66 | case ARCH_ID_AT91SAM9260: | 62 | case ARCH_ID_AT91SAM9260: |
@@ -106,7 +102,6 @@ static void __init soc_detect(u32 dbgu_base) | |||
106 | at91_soc_initdata.exid = __raw_readl(AT91_IO_P2V(dbgu_base) + AT91_DBGU_EXID); | 102 | at91_soc_initdata.exid = __raw_readl(AT91_IO_P2V(dbgu_base) + AT91_DBGU_EXID); |
107 | if (at91_soc_initdata.exid & ARCH_EXID_SAMA5D3) { | 103 | if (at91_soc_initdata.exid & ARCH_EXID_SAMA5D3) { |
108 | at91_soc_initdata.type = AT91_SOC_SAMA5D3; | 104 | at91_soc_initdata.type = AT91_SOC_SAMA5D3; |
109 | at91_boot_soc = sama5d3_soc; | ||
110 | } | 105 | } |
111 | break; | 106 | break; |
112 | } | 107 | } |
@@ -199,10 +194,8 @@ static void __init alt_soc_detect(u32 dbgu_base) | |||
199 | at91_soc_initdata.exid = __raw_readl(AT91_ALT_IO_P2V(dbgu_base) + AT91_DBGU_EXID); | 194 | at91_soc_initdata.exid = __raw_readl(AT91_ALT_IO_P2V(dbgu_base) + AT91_DBGU_EXID); |
200 | if (at91_soc_initdata.exid & ARCH_EXID_SAMA5D3) { | 195 | if (at91_soc_initdata.exid & ARCH_EXID_SAMA5D3) { |
201 | at91_soc_initdata.type = AT91_SOC_SAMA5D3; | 196 | at91_soc_initdata.type = AT91_SOC_SAMA5D3; |
202 | at91_boot_soc = sama5d3_soc; | ||
203 | } else if (at91_soc_initdata.exid & ARCH_EXID_SAMA5D4) { | 197 | } else if (at91_soc_initdata.exid & ARCH_EXID_SAMA5D4) { |
204 | at91_soc_initdata.type = AT91_SOC_SAMA5D4; | 198 | at91_soc_initdata.type = AT91_SOC_SAMA5D4; |
205 | at91_boot_soc = sama5d4_soc; | ||
206 | } | 199 | } |
207 | break; | 200 | break; |
208 | } | 201 | } |