1 files changed, 21 insertions, 79 deletions

diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
index 7d606b04d313..cb397be14448 100644
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@ -17,58 +17,16 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <mach/cpu.h>
+#include <mach/at91_dbgu.h>
 #include <mach/at91sam9260.h>
 #include <mach/at91_pmc.h>
 #include <mach/at91_rstc.h>
 #include <mach/at91_shdwc.h>
 
+#include "soc.h"
 #include "generic.h"
 #include "clock.h"
 
-static struct map_desc at91sam9260_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 at91sam9260_sram_desc[] __initdata = {
-        {
-                .virtual        = AT91_IO_VIRT_BASE - AT91SAM9260_SRAM0_SIZE,
-                .pfn            = __phys_to_pfn(AT91SAM9260_SRAM0_BASE),
-                .length         = AT91SAM9260_SRAM0_SIZE,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = AT91_IO_VIRT_BASE - AT91SAM9260_SRAM0_SIZE - AT91SAM9260_SRAM1_SIZE,
-                .pfn            = __phys_to_pfn(AT91SAM9260_SRAM1_BASE),
-                .length         = AT91SAM9260_SRAM1_SIZE,
-                .type           = MT_DEVICE,
-        }
-};
-
-static struct map_desc at91sam9g20_sram_desc[] __initdata = {
-        {
-                .virtual        = AT91_IO_VIRT_BASE - AT91SAM9G20_SRAM0_SIZE,
-                .pfn            = __phys_to_pfn(AT91SAM9G20_SRAM0_BASE),
-                .length         = AT91SAM9G20_SRAM0_SIZE,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = AT91_IO_VIRT_BASE - AT91SAM9G20_SRAM0_SIZE - AT91SAM9G20_SRAM1_SIZE,
-                .pfn            = __phys_to_pfn(AT91SAM9G20_SRAM1_BASE),
-                .length         = AT91SAM9G20_SRAM1_SIZE,
-                .type           = MT_DEVICE,
-        }
-};
-
-static struct map_desc at91sam9xe_sram_desc[] __initdata = {
-        {
-                .pfn            = __phys_to_pfn(AT91SAM9XE_SRAM_BASE),
-                .type           = MT_DEVICE,
-        }
-};
-
 /* --------------------------------------------------------------------
  *  Clocks
  * -------------------------------------------------------------------- */
@@ -330,11 +288,9 @@ static void at91sam9260_poweroff(void)
 
 static void __init at91sam9xe_map_io(void)
 {
-        unsigned long cidr, sram_size;
-
-        cidr = at91_sys_read(AT91_DBGU_CIDR);
+        unsigned long sram_size;
 
-        switch (cidr & AT91_CIDR_SRAMSIZ) {
+        switch (at91_soc_initdata.cidr & AT91_CIDR_SRAMSIZ) {
                 case AT91_CIDR_SRAMSIZ_32K:
                         sram_size = 2 * SZ_16K;
                         break;
@@ -343,38 +299,29 @@ static void __init at91sam9xe_map_io(void)
                         sram_size = SZ_16K;
         }
 
-        at91sam9xe_sram_desc->virtual = AT91_IO_VIRT_BASE - sram_size;
-        at91sam9xe_sram_desc->length = sram_size;
-
-        iotable_init(at91sam9xe_sram_desc, ARRAY_SIZE(at91sam9xe_sram_desc));
+        at91_init_sram(0, AT91SAM9XE_SRAM_BASE, sram_size);
 }
 
-void __init at91sam9260_map_io(void)
+static void __init at91sam9260_map_io(void)
 {
-        /* Map peripherals */
-        iotable_init(at91sam9260_io_desc, ARRAY_SIZE(at91sam9260_io_desc));
-
-        if (cpu_is_at91sam9xe())
+        if (cpu_is_at91sam9xe()) {
                 at91sam9xe_map_io();
-        else if (cpu_is_at91sam9g20())
-                iotable_init(at91sam9g20_sram_desc, ARRAY_SIZE(at91sam9g20_sram_desc));
-        else
-                iotable_init(at91sam9260_sram_desc, ARRAY_SIZE(at91sam9260_sram_desc));
+        } else if (cpu_is_at91sam9g20()) {
+                at91_init_sram(0, AT91SAM9G20_SRAM0_BASE, AT91SAM9G20_SRAM0_SIZE);
+                at91_init_sram(1, AT91SAM9G20_SRAM1_BASE, AT91SAM9G20_SRAM1_SIZE);
+        } else {
+                at91_init_sram(0, AT91SAM9260_SRAM0_BASE, AT91SAM9260_SRAM0_SIZE);
+                at91_init_sram(1, AT91SAM9260_SRAM1_BASE, AT91SAM9260_SRAM1_SIZE);
+        }
 }
 
-void __init at91sam9260_initialize(unsigned long main_clock)
+static void __init at91sam9260_initialize(void)
 {
         at91_arch_reset = at91sam9_alt_reset;
         pm_power_off = at91sam9260_poweroff;
         at91_extern_irq = (1 << AT91SAM9260_ID_IRQ0) | (1 << AT91SAM9260_ID_IRQ1)
                         | (1 << AT91SAM9260_ID_IRQ2);
 
-        /* Init clock subsystem */
-        at91_clock_init(main_clock);
-
-        /* Register the processor-specific clocks */
-        at91sam9260_register_clocks();
-
         /* Register GPIO subsystem */
         at91_gpio_init(at91sam9260_gpio, 3);
 }
@@ -421,14 +368,9 @@ static unsigned int at91sam9260_default_irq_priority[NR_AIC_IRQS] __initdata = {
         0,      /* Advanced Interrupt Controller */
 };
 
-void __init at91sam9260_init_interrupts(unsigned int priority[NR_AIC_IRQS])
-{
-        if (!priority)
-                priority = at91sam9260_default_irq_priority;
-
-        /* Initialize the AIC interrupt controller */
-        at91_aic_init(priority);
-
-        /* Enable GPIO interrupts */
-        at91_gpio_irq_setup();
-}
+struct at91_init_soc __initdata at91sam9260_soc = {
+        .map_io = at91sam9260_map_io,
+        .default_irq_priority = at91sam9260_default_irq_priority,
+        .register_clocks = at91sam9260_register_clocks,
+        .init = at91sam9260_initialize,
+};