1 files changed, 29 insertions, 28 deletions

diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c
index 1c48890bb72b..97cbb8021919 100644
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@ -14,13 +14,13 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/clk-provider.h>
+#include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <linux/io.h>
 #include <linux/time-armada-370-xp.h>
-#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,45 +29,49 @@
 #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)
-{
-        mvebu_clocks_init();
-        armada_370_xp_timer_init();
-}
+/*
+ * This initialization will be replaced by a DT-based
+ * initialization once the mvebu-mbus driver gains DT support.
+ */
 
-void __init armada_370_xp_init_early(void)
+#define ARMADA_370_XP_MBUS_WINS_OFFS   0x20000
+#define ARMADA_370_XP_MBUS_WINS_SIZE   0x100
+#define ARMADA_370_XP_SDRAM_WINS_OFFS  0x20180
+#define ARMADA_370_XP_SDRAM_WINS_SIZE  0x20
+
+static void __init armada_370_xp_mbus_init(void)
 {
         char *mbus_soc_name;
+        struct device_node *dn;
+        const __be32 mbus_wins_offs = cpu_to_be32(ARMADA_370_XP_MBUS_WINS_OFFS);
+        const __be32 sdram_wins_offs = cpu_to_be32(ARMADA_370_XP_SDRAM_WINS_OFFS);
 
-        /*
-         * This initialization will be replaced by a DT-based
-         * initialization once the mvebu-mbus driver gains DT support.
-         */
         if (of_machine_is_compatible("marvell,armada370"))
                 mbus_soc_name = "marvell,armada370-mbus";
         else
                 mbus_soc_name = "marvell,armadaxp-mbus";
 
+        dn = of_find_node_by_name(NULL, "internal-regs");
+        BUG_ON(!dn);
+
         mvebu_mbus_init(mbus_soc_name,
-                        ARMADA_370_XP_MBUS_WINS_BASE,
+                        of_translate_address(dn, &mbus_wins_offs),
                         ARMADA_370_XP_MBUS_WINS_SIZE,
-                        ARMADA_370_XP_SDRAM_WINS_BASE,
+                        of_translate_address(dn, &sdram_wins_offs),
                         ARMADA_370_XP_SDRAM_WINS_SIZE);
+}
 
+static void __init armada_370_xp_timer_and_clk_init(void)
+{
+        of_clk_init(NULL);
+        armada_370_xp_timer_init();
+        coherency_init();
+        armada_370_xp_mbus_init();
 #ifdef CONFIG_CACHE_L2X0
         l2x0_of_init(0, ~0UL);
 #endif
@@ -76,7 +80,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 +91,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,