arm: mvebu: remove hardcoded static I/O mapping

[karo-tx-linux.git] / arch / arm / mach-mvebu / armada-370-xp.c

diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c
index 1c48890bb72b2c7ad1301cdc9f8bad007362bf57..c1c0556fd2503dcc5da9acd8bd0a8666cc4f4839 100644 (file)
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@ -20,7 +20,6 @@
 #include <linux/clk/mvebu.h>
 #include <linux/dma-mapping.h>
 #include <linux/mbus.h>
-#include <linux/irqchip.h>
 #include <asm/hardware/cache-l2x0.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
@@ -29,29 +28,18 @@
 #include "common.h"
 #include "coherency.h"
 
-static struct map_desc armada_370_xp_io_desc[] __initdata = {
-       {
-               .virtual        = (unsigned long) ARMADA_370_XP_REGS_VIRT_BASE,
-               .pfn            = __phys_to_pfn(ARMADA_370_XP_REGS_PHYS_BASE),
-               .length         = ARMADA_370_XP_REGS_SIZE,
-               .type           = MT_DEVICE,
-       },
-};
-
-void __init armada_370_xp_map_io(void)
+static void __init armada_370_xp_map_io(void)
 {
-       iotable_init(armada_370_xp_io_desc, ARRAY_SIZE(armada_370_xp_io_desc));
+       debug_ll_io_init();
 }
 
-void __init armada_370_xp_timer_and_clk_init(void)
+static void __init armada_370_xp_timer_and_clk_init(void)
 {
+       char *mbus_soc_name;
+
        mvebu_clocks_init();
        armada_370_xp_timer_init();
-}
-
-void __init armada_370_xp_init_early(void)
-{
-       char *mbus_soc_name;
+       coherency_init();
 
        /*
         * This initialization will be replaced by a DT-based
@@ -76,7 +64,6 @@ void __init armada_370_xp_init_early(void)
 static void __init armada_370_xp_dt_init(void)
 {
        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
-       coherency_init();
 }
 
 static const char * const armada_370_xp_dt_compat[] = {
@@ -88,8 +75,6 @@ DT_MACHINE_START(ARMADA_XP_DT, "Marvell Armada 370/XP (Device Tree)")
        .smp            = smp_ops(armada_xp_smp_ops),
        .init_machine   = armada_370_xp_dt_init,
        .map_io         = armada_370_xp_map_io,
-       .init_early     = armada_370_xp_init_early,
-       .init_irq       = irqchip_init,
        .init_time      = armada_370_xp_timer_and_clk_init,
        .restart        = mvebu_restart,
        .dt_compat      = armada_370_xp_dt_compat,