diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2011-04-23 03:28:34 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 11:07:28 -0400 |
commit | 21d08b9d5536ac418bbce4f419fe2b528b7ddf31 (patch) | |
tree | f1a1bbf5645d933799e31d93365458826dfadea6 /arch/arm/mach-at91/at91sam9260.c | |
parent | 02f8c6aee8df3cdc935e9bdd4f2d020306035dbe (diff) |
at91: introduce commom AT91_BASE_SYS
On all at91 except rm9200 and x40 have the System Controller starts
at address 0xffffc000 and has a size of 16KiB.
On rm9200 it's start at 0xfffe4000 of 111KiB with non reserved data starting
at 0xfffff000
This patch removes the individual definitions of AT91_BASE_SYS and
replaces them with a common version at base 0xfffffc000 and size 16KiB
and map the same memory space
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Patrice Vilchez <patrice.vilchez@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91/at91sam9260.c')
-rw-r--r-- | arch/arm/mach-at91/at91sam9260.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c index 7d606b04d313..366c5d69393b 100644 --- a/arch/arm/mach-at91/at91sam9260.c +++ b/arch/arm/mach-at91/at91sam9260.c | |||
@@ -22,18 +22,10 @@ | |||
22 | #include <mach/at91_rstc.h> | 22 | #include <mach/at91_rstc.h> |
23 | #include <mach/at91_shdwc.h> | 23 | #include <mach/at91_shdwc.h> |
24 | 24 | ||
25 | #include "soc.h" | ||
25 | #include "generic.h" | 26 | #include "generic.h" |
26 | #include "clock.h" | 27 | #include "clock.h" |
27 | 28 | ||
28 | static struct map_desc at91sam9260_io_desc[] __initdata = { | ||
29 | { | ||
30 | .virtual = AT91_VA_BASE_SYS, | ||
31 | .pfn = __phys_to_pfn(AT91_BASE_SYS), | ||
32 | .length = SZ_16K, | ||
33 | .type = MT_DEVICE, | ||
34 | } | ||
35 | }; | ||
36 | |||
37 | static struct map_desc at91sam9260_sram_desc[] __initdata = { | 29 | static struct map_desc at91sam9260_sram_desc[] __initdata = { |
38 | { | 30 | { |
39 | .virtual = AT91_IO_VIRT_BASE - AT91SAM9260_SRAM0_SIZE, | 31 | .virtual = AT91_IO_VIRT_BASE - AT91SAM9260_SRAM0_SIZE, |
@@ -349,11 +341,8 @@ static void __init at91sam9xe_map_io(void) | |||
349 | iotable_init(at91sam9xe_sram_desc, ARRAY_SIZE(at91sam9xe_sram_desc)); | 341 | iotable_init(at91sam9xe_sram_desc, ARRAY_SIZE(at91sam9xe_sram_desc)); |
350 | } | 342 | } |
351 | 343 | ||
352 | void __init at91sam9260_map_io(void) | 344 | static void __init at91sam9260_map_io(void) |
353 | { | 345 | { |
354 | /* Map peripherals */ | ||
355 | iotable_init(at91sam9260_io_desc, ARRAY_SIZE(at91sam9260_io_desc)); | ||
356 | |||
357 | if (cpu_is_at91sam9xe()) | 346 | if (cpu_is_at91sam9xe()) |
358 | at91sam9xe_map_io(); | 347 | at91sam9xe_map_io(); |
359 | else if (cpu_is_at91sam9g20()) | 348 | else if (cpu_is_at91sam9g20()) |
@@ -362,7 +351,7 @@ void __init at91sam9260_map_io(void) | |||
362 | iotable_init(at91sam9260_sram_desc, ARRAY_SIZE(at91sam9260_sram_desc)); | 351 | iotable_init(at91sam9260_sram_desc, ARRAY_SIZE(at91sam9260_sram_desc)); |
363 | } | 352 | } |
364 | 353 | ||
365 | void __init at91sam9260_initialize(unsigned long main_clock) | 354 | static void __init at91sam9260_initialize(unsigned long main_clock) |
366 | { | 355 | { |
367 | at91_arch_reset = at91sam9_alt_reset; | 356 | at91_arch_reset = at91sam9_alt_reset; |
368 | pm_power_off = at91sam9260_poweroff; | 357 | pm_power_off = at91sam9260_poweroff; |
@@ -432,3 +421,8 @@ void __init at91sam9260_init_interrupts(unsigned int priority[NR_AIC_IRQS]) | |||
432 | /* Enable GPIO interrupts */ | 421 | /* Enable GPIO interrupts */ |
433 | at91_gpio_irq_setup(); | 422 | at91_gpio_irq_setup(); |
434 | } | 423 | } |
424 | |||
425 | struct at91_soc __initdata at91sam9260_soc = { | ||
426 | .map_io = at91sam9260_map_io, | ||
427 | .init = at91sam9260_initialize, | ||
428 | }; | ||