1 files changed, 16 insertions, 7 deletions

diff --git a/arch/arm/mach-dove/board-dt.c b/arch/arm/mach-dove/board-dt.c
index b5ccc1c05563..49f72a848423 100644
--- a/arch/arm/mach-dove/board-dt.c
+++ b/arch/arm/mach-dove/board-dt.c
@@ -10,11 +10,14 @@
 
 #include <linux/init.h>
 #include <linux/clk-provider.h>
+#include <linux/clocksource.h>
+#include <linux/irqchip.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/platform_data/usb-ehci-orion.h>
 #include <asm/hardware/cache-tauros2.h>
 #include <asm/mach/arch.h>
+#include <mach/dove.h>
 #include <mach/pm.h>
 #include <plat/common.h>
 #include <plat/irq.h>
@@ -42,10 +45,17 @@ static void __init dove_legacy_clk_init(void)
                          of_clk_get_from_provider(&clkspec));
 }
 
-static void __init dove_of_clk_init(void)
+static void __init dove_dt_time_init(void)
 {
         of_clk_init(NULL);
-        dove_legacy_clk_init();
+        clocksource_of_init();
+}
+
+static void __init dove_dt_init_early(void)
+{
+        mvebu_mbus_init("marvell,dove-mbus",
+                        BRIDGE_WINS_BASE, BRIDGE_WINS_SZ,
+                        DOVE_MC_WINS_BASE, DOVE_MC_WINS_SZ);
 }
 
 static void __init dove_dt_init(void)
@@ -57,8 +67,8 @@ static void __init dove_dt_init(void)
 #endif
         dove_setup_cpu_wins();
 
-        /* Setup root of clk tree */
-        dove_of_clk_init();
+        /* Setup clocks for legacy devices */
+        dove_legacy_clk_init();
 
         /* Internal devices not ported to DT yet */
         dove_pcie_init(1, 1);
@@ -73,9 +83,8 @@ static const char * const dove_dt_board_compat[] = {
 
 DT_MACHINE_START(DOVE_DT, "Marvell Dove (Flattened Device Tree)")
         .map_io         = dove_map_io,
-        .init_early     = dove_init_early,
-        .init_irq       = orion_dt_init_irq,
-        .init_time      = dove_timer_init,
+        .init_early     = dove_dt_init_early,
+        .init_time      = dove_dt_time_init,
         .init_machine   = dove_dt_init,
         .restart        = dove_restart,
         .dt_compat      = dove_dt_board_compat,