diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2011-11-01 13:43:31 -0400 |
---|---|---|
committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2011-11-28 09:50:39 -0500 |
commit | 13079a733313c00ca92fc6716383dd126caa7276 (patch) | |
tree | 8052b91a3f42d8f92f9547ca87cf1555d2f834c9 /arch/arm/mach-at91/setup.c | |
parent | c1c30a29df7e47310caa979dc48f715ae478de5f (diff) |
ARM: at91: make DBGU soc independent
we will select now the DBGU used by the soc at Kconfig level
For the DEBUG_LL and early_printk this will allow to select which DBGU to use
this will also allow to select them when multiple SOC are enabled
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91/setup.c')
-rw-r--r-- | arch/arm/mach-at91/setup.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c index 053c36993154..242c26b2368d 100644 --- a/arch/arm/mach-at91/setup.c +++ b/arch/arm/mach-at91/setup.c | |||
@@ -93,9 +93,6 @@ void at91_iounmap(volatile void __iomem *addr) | |||
93 | } | 93 | } |
94 | EXPORT_SYMBOL(at91_iounmap); | 94 | EXPORT_SYMBOL(at91_iounmap); |
95 | 95 | ||
96 | #define AT91_DBGU0 0xfffff200 | ||
97 | #define AT91_DBGU1 0xffffee00 | ||
98 | |||
99 | static void __init soc_detect(u32 dbgu_base) | 96 | static void __init soc_detect(u32 dbgu_base) |
100 | { | 97 | { |
101 | u32 cidr, socid; | 98 | u32 cidr, socid; |
@@ -268,9 +265,9 @@ void __init at91_map_io(void) | |||
268 | at91_soc_initdata.type = AT91_SOC_NONE; | 265 | at91_soc_initdata.type = AT91_SOC_NONE; |
269 | at91_soc_initdata.subtype = AT91_SOC_SUBTYPE_NONE; | 266 | at91_soc_initdata.subtype = AT91_SOC_SUBTYPE_NONE; |
270 | 267 | ||
271 | soc_detect(AT91_DBGU0); | 268 | soc_detect(AT91_BASE_DBGU0); |
272 | if (!at91_soc_is_detected()) | 269 | if (!at91_soc_is_detected()) |
273 | soc_detect(AT91_DBGU1); | 270 | soc_detect(AT91_BASE_DBGU1); |
274 | 271 | ||
275 | if (!at91_soc_is_detected()) | 272 | if (!at91_soc_is_detected()) |
276 | panic("AT91: Impossible to detect the SOC type"); | 273 | panic("AT91: Impossible to detect the SOC type"); |