1 files changed, 9 insertions, 44 deletions

diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
index 1addfef73b6c..cb397be14448 100644
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@ -27,41 +27,6 @@
 #include "generic.h"
 #include "clock.h"
 
-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
  * -------------------------------------------------------------------- */
@@ -334,20 +299,20 @@ 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);
 }
 
 static void __init at91sam9260_map_io(void)
 {
-        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);
+        }
 }
 
 static void __init at91sam9260_initialize(void)