diff options
Diffstat (limited to 'arch/arm/mach-at91/at91sam9261.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9261.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c index c1483168c97..a0081c081c3 100644 --- a/arch/arm/mach-at91/at91sam9261.c +++ b/arch/arm/mach-at91/at91sam9261.c @@ -22,18 +22,10 @@ #include <mach/at91_rstc.h> #include <mach/at91_shdwc.h> +#include "soc.h" #include "generic.h" #include "clock.h" -static struct map_desc at91sam9261_io_desc[] __initdata = { - { - .virtual = AT91_VA_BASE_SYS, - .pfn = __phys_to_pfn(AT91_BASE_SYS), - .length = SZ_16K, - .type = MT_DEVICE, - }, -}; - static struct map_desc at91sam9261_sram_desc[] __initdata = { { .virtual = AT91_IO_VIRT_BASE - AT91SAM9261_SRAM_SIZE, @@ -302,18 +294,15 @@ static void at91sam9261_poweroff(void) * AT91SAM9261 processor initialization * -------------------------------------------------------------------- */ -void __init at91sam9261_map_io(void) +static void __init at91sam9261_map_io(void) { - /* Map peripherals */ - iotable_init(at91sam9261_io_desc, ARRAY_SIZE(at91sam9261_io_desc)); - if (cpu_is_at91sam9g10()) iotable_init(at91sam9g10_sram_desc, ARRAY_SIZE(at91sam9g10_sram_desc)); else iotable_init(at91sam9261_sram_desc, ARRAY_SIZE(at91sam9261_sram_desc)); } -void __init at91sam9261_initialize(unsigned long main_clock) +static void __init at91sam9261_initialize(unsigned long main_clock) { at91_arch_reset = at91sam9_alt_reset; pm_power_off = at91sam9261_poweroff; @@ -383,3 +372,8 @@ void __init at91sam9261_init_interrupts(unsigned int priority[NR_AIC_IRQS]) /* Enable GPIO interrupts */ at91_gpio_irq_setup(); } + +struct at91_soc __initdata at91sam9261_soc = { + .map_io = at91sam9261_map_io, + .init = at91sam9261_initialize, +}; |