Merge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

[firefly-linux-kernel-4.4.55.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 4ea03ad4117971060d3807d7a5f88f3460a02ef6..e2acff98e750a013dd54356249306259cb055091 100644 (file)
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@ -34,44 +34,12 @@ static void __init armada_370_xp_map_io(void)
        debug_ll_io_init();
 }
 
-/*
- * This initialization will be replaced by a DT-based
- * initialization once the mvebu-mbus driver gains DT support.
- */
-
-#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);
-
-       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,
-                       of_translate_address(dn, &mbus_wins_offs),
-                       ARMADA_370_XP_MBUS_WINS_SIZE,
-                       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);
        clocksource_of_init();
        coherency_init();
-       armada_370_xp_mbus_init();
+       BUG_ON(mvebu_mbus_dt_init());
 #ifdef CONFIG_CACHE_L2X0
        l2x0_of_init(0, ~0UL);
 #endif