diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2011-04-23 09:28:34 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 17:07:28 +0200 |
| commit | 21d08b9d5536ac418bbce4f419fe2b528b7ddf31 (patch) | |
| tree | f1a1bbf5645d933799e31d93365458826dfadea6 /arch/arm/mach-at91/at91cap9.c | |
| parent | Linux 3.0 (diff) | |
| download | linux-21d08b9d5536ac418bbce4f419fe2b528b7ddf31.tar.xz linux-21d08b9d5536ac418bbce4f419fe2b528b7ddf31.zip | |
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/at91cap9.c')
| -rw-r--r-- | arch/arm/mach-at91/at91cap9.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/arch/arm/mach-at91/at91cap9.c b/arch/arm/mach-at91/at91cap9.c index f1013d08bb57..7ec9eeb64286 100644 --- a/arch/arm/mach-at91/at91cap9.c +++ b/arch/arm/mach-at91/at91cap9.c @@ -25,16 +25,12 @@ #include <mach/at91_rstc.h> #include <mach/at91_shdwc.h> +#include "soc.h" #include "generic.h" #include "clock.h" -static struct map_desc at91cap9_io_desc[] __initdata = { +static struct map_desc at91cap9_sram_desc[] __initdata = { { - .virtual = AT91_VA_BASE_SYS, - .pfn = __phys_to_pfn(AT91_BASE_SYS), - .length = SZ_16K, - .type = MT_DEVICE, - }, { .virtual = AT91_IO_VIRT_BASE - AT91CAP9_SRAM_SIZE, .pfn = __phys_to_pfn(AT91CAP9_SRAM_BASE), .length = AT91CAP9_SRAM_SIZE, @@ -339,14 +335,12 @@ static void at91cap9_poweroff(void) * AT91CAP9 processor initialization * -------------------------------------------------------------------- */ -void __init at91cap9_map_io(void) +static void __init at91cap9_map_io(void) { - /* Map peripherals */ - iotable_init(at91cap9_io_desc, ARRAY_SIZE(at91cap9_io_desc)); + iotable_init(at91cap9_sram_desc, ARRAY_SIZE(at91cap9_sram_desc)); } -void __init at91cap9_initialize(unsigned long main_clock) -{ +static void __init at91cap9_initialize(unsigned long main_clock) at91_arch_reset = at91cap9_reset; pm_power_off = at91cap9_poweroff; at91_extern_irq = (1 << AT91CAP9_ID_IRQ0) | (1 << AT91CAP9_ID_IRQ1); @@ -420,3 +414,8 @@ void __init at91cap9_init_interrupts(unsigned int priority[NR_AIC_IRQS]) /* Enable GPIO interrupts */ at91_gpio_irq_setup(); } + +struct at91_soc __initdata at91cap9_soc = { + .map_io = at91cap9_map_io, + .init = at91cap9_initialize, +}; |