ARM: at91: remove useless map_io

Now that the SRAM is initialized by the mmio-sram driver, .map_io is useless.
remove it.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c
index b5291694753513cd02e64cabe1f566eab04d9201..fc7c261380379e2f626f0bf5ca8ce7728bd2a696 100644 (file)
--- a/arch/arm/mach-at91/at91rm9200.c
+++ b/arch/arm/mach-at91/at91rm9200.c
@@ -42,11 +42,6 @@ static void at91rm9200_restart(enum reboot_mode reboot_mode, const char *cmd)
 /* --------------------------------------------------------------------
  *  AT91RM9200 processor initialization
  * -------------------------------------------------------------------- */
-static void __init at91rm9200_map_io(void)
-{
-       /* Map peripherals */
-       at91_init_sram(0, AT91RM9200_SRAM_BASE, AT91RM9200_SRAM_SIZE);
-}
 
 static void __init at91rm9200_initialize(void)
 {
@@ -56,6 +51,5 @@ static void __init at91rm9200_initialize(void)
 
 
 AT91_SOC_START(at91rm9200)
-       .map_io = at91rm9200_map_io,
        .init = at91rm9200_initialize,
 AT91_SOC_END

diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
index 34e2abe82ae41a4723320a0ed0026aa045864e7e..ab9841c8b0d5d544b9caae7009edd6cc4fb25d56 100644 (file)
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@ -22,38 +22,11 @@
  *  AT91SAM9260 processor initialization
  * -------------------------------------------------------------------- */
 
-static void __init at91sam9xe_map_io(void)
-{
-       unsigned long sram_size;
-
-       switch (at91_soc_initdata.cidr & AT91_CIDR_SRAMSIZ) {
-               case AT91_CIDR_SRAMSIZ_32K:
-                       sram_size = 2 * SZ_16K;
-                       break;
-               case AT91_CIDR_SRAMSIZ_16K:
-               default:
-                       sram_size = SZ_16K;
-       }
-
-       at91_init_sram(0, AT91SAM9XE_SRAM_BASE, sram_size);
-}
-
-static void __init at91sam9260_map_io(void)
-{
-       if (cpu_is_at91sam9xe())
-               at91sam9xe_map_io();
-       else if (cpu_is_at91sam9g20())
-               at91_init_sram(0, AT91SAM9G20_SRAM_BASE, AT91SAM9G20_SRAM_SIZE);
-       else
-               at91_init_sram(0, AT91SAM9260_SRAM_BASE, AT91SAM9260_SRAM_SIZE);
-}
-
 static void __init at91sam9260_initialize(void)
 {
        arm_pm_idle = at91sam9_idle;
 }
 
 AT91_SOC_START(at91sam9260)
-       .map_io = at91sam9260_map_io,
        .init = at91sam9260_initialize,
 AT91_SOC_END

diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c
index 47878b8499757bf20bb06c78767ba6702def13da..2029096b93fa925b1c8508e3c44eb5762a88c82d 100644 (file)
--- a/arch/arm/mach-at91/at91sam9261.c
+++ b/arch/arm/mach-at91/at91sam9261.c
@@ -21,20 +21,11 @@
  *  AT91SAM9261 processor initialization
  * -------------------------------------------------------------------- */
 
-static void __init at91sam9261_map_io(void)
-{
-       if (cpu_is_at91sam9g10())
-               at91_init_sram(0, AT91SAM9G10_SRAM_BASE, AT91SAM9G10_SRAM_SIZE);
-       else
-               at91_init_sram(0, AT91SAM9261_SRAM_BASE, AT91SAM9261_SRAM_SIZE);
-}
-
 static void __init at91sam9261_initialize(void)
 {
        arm_pm_idle = at91sam9_idle;
 }
 
 AT91_SOC_START(at91sam9261)
-       .map_io = at91sam9261_map_io,
        .init = at91sam9261_initialize,
 AT91_SOC_END

diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c
index aabcb66145d0ff0bbebf2cb17a1ad0b7c895443d..1fe672a055139ac757d605177178cd4551a52145 100644 (file)
--- a/arch/arm/mach-at91/at91sam9263.c
+++ b/arch/arm/mach-at91/at91sam9263.c
@@ -20,18 +20,11 @@
  *  AT91SAM9263 processor initialization
  * -------------------------------------------------------------------- */
 
-static void __init at91sam9263_map_io(void)
-{
-       at91_init_sram(0, AT91SAM9263_SRAM0_BASE, AT91SAM9263_SRAM0_SIZE);
-       at91_init_sram(1, AT91SAM9263_SRAM1_BASE, AT91SAM9263_SRAM1_SIZE);
-}
-
 static void __init at91sam9263_initialize(void)
 {
        arm_pm_idle = at91sam9_idle;
 }
 
 AT91_SOC_START(at91sam9263)
-       .map_io = at91sam9263_map_io,
        .init = at91sam9263_initialize,
 AT91_SOC_END

diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
index 000166777a8d2b5376ddffba74689e5d474c0b7a..d0493df40a13b64654410a03587ef32d1215e85a 100644 (file)
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@ -19,18 +19,11 @@
 /* --------------------------------------------------------------------
  *  AT91SAM9G45 processor initialization
  * -------------------------------------------------------------------- */
-
-static void __init at91sam9g45_map_io(void)
-{
-       at91_init_sram(0, AT91SAM9G45_SRAM_BASE, AT91SAM9G45_SRAM_SIZE);
-}
-
 static void __init at91sam9g45_initialize(void)
 {
        arm_pm_idle = at91sam9_idle;
 }
 
 AT91_SOC_START(at91sam9g45)
-       .map_io = at91sam9g45_map_io,
        .init = at91sam9g45_initialize,
 AT91_SOC_END

diff --git a/arch/arm/mach-at91/at91sam9n12.c b/arch/arm/mach-at91/at91sam9n12.c
index 0135f868ea4f1070d6b456ea6563275a8835bcc3..b5ea69a3eaf6c2ce2555f325fa35dfed584bbe3e 100644 (file)
--- a/arch/arm/mach-at91/at91sam9n12.c
+++ b/arch/arm/mach-at91/at91sam9n12.c
@@ -16,11 +16,5 @@
  *  AT91SAM9N12 processor initialization
  * -------------------------------------------------------------------- */
 
-static void __init at91sam9n12_map_io(void)
-{
-       at91_init_sram(0, AT91SAM9N12_SRAM_BASE, AT91SAM9N12_SRAM_SIZE);
-}
-
 AT91_SOC_START(at91sam9n12)
-       .map_io = at91sam9n12_map_io,
 AT91_SOC_END

diff --git a/arch/arm/mach-at91/at91sam9rl.c b/arch/arm/mach-at91/at91sam9rl.c
index 1babfb27694a18fb6e2aeb6e28b90148b16a2a04..33acae30bb0bdbafeba960299c31769cbdf55737 100644 (file)
--- a/arch/arm/mach-at91/at91sam9rl.c
+++ b/arch/arm/mach-at91/at91sam9rl.c
@@ -21,29 +21,11 @@
  *  AT91SAM9RL processor initialization
  * -------------------------------------------------------------------- */
 
-static void __init at91sam9rl_map_io(void)
-{
-       unsigned long sram_size;
-
-       switch (at91_soc_initdata.cidr & AT91_CIDR_SRAMSIZ) {
-               case AT91_CIDR_SRAMSIZ_32K:
-                       sram_size = 2 * SZ_16K;
-                       break;
-               case AT91_CIDR_SRAMSIZ_16K:
-               default:
-                       sram_size = SZ_16K;
-       }
-
-       /* Map SRAM */
-       at91_init_sram(0, AT91SAM9RL_SRAM_BASE, sram_size);
-}
-
 static void __init at91sam9rl_initialize(void)
 {
        arm_pm_idle = at91sam9_idle;
 }
 
 AT91_SOC_START(at91sam9rl)
-       .map_io = at91sam9rl_map_io,
        .init = at91sam9rl_initialize,
 AT91_SOC_END

diff --git a/arch/arm/mach-at91/at91sam9x5.c b/arch/arm/mach-at91/at91sam9x5.c
index aa17520ccb0a96aaf4945ab492270cebf90fb2b2..7b60a529db0180109ea5fd3a22e9e9ca7edff665 100644 (file)
--- a/arch/arm/mach-at91/at91sam9x5.c
+++ b/arch/arm/mach-at91/at91sam9x5.c
@@ -16,11 +16,5 @@
  *  AT91SAM9x5 processor initialization
  * -------------------------------------------------------------------- */
 
-static void __init at91sam9x5_map_io(void)
-{
-       at91_init_sram(0, AT91SAM9X5_SRAM_BASE, AT91SAM9X5_SRAM_SIZE);
-}
-
 AT91_SOC_START(at91sam9x5)
-       .map_io = at91sam9x5_map_io,
 AT91_SOC_END

diff --git a/arch/arm/mach-at91/sama5d3.c b/arch/arm/mach-at91/sama5d3.c
index ae58feada72ba5d0d0fba420ce743a9168ef6e8e..b7c64ca7107f74b701e15aa641e6676f1b6a2354 100644 (file)
--- a/arch/arm/mach-at91/sama5d3.c
+++ b/arch/arm/mach-at91/sama5d3.c
@@ -25,11 +25,5 @@
  *  AT91SAM9x5 processor initialization
  * -------------------------------------------------------------------- */
 
-static void __init sama5d3_map_io(void)
-{
-       at91_init_sram(0, SAMA5D3_SRAM_BASE, SAMA5D3_SRAM_SIZE);
-}
-
 AT91_SOC_START(sama5d3)
-       .map_io = sama5d3_map_io,
 AT91_SOC_END