Merge remote-tracking branch 'mvebu/for-next'

Conflicts:
	arch/arm/mach-mvebu/board-v7.c

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/mach-mvebu/board-v7.c
index c6bd79f647447627f8bbbd5fddc5956a56ef604c,bc0283f0dd88dca7e24320a1d2dfda165099335a..6354d53c1977f028cefabb7f58936e74e9a4c689
--- 1/arch/arm/mach-mvebu/board-v7.c
--- 2/arch/arm/mach-mvebu/board-v7.c
+++ b/arch/arm/mach-mvebu/board-v7.c
@@@ -57,11 -75,10 +75,10 @@@ static void __init mvebu_timer_and_clk_
  {
        of_clk_init(NULL);
        clocksource_of_init();
+       mvebu_scu_enable();
        coherency_init();
-       BUG_ON(mvebu_mbus_dt_init());
- #ifdef CONFIG_CACHE_L2X0
+       BUG_ON(mvebu_mbus_dt_init(coherency_available()));
 -      l2x0_of_init(0, ~0UL);
 +      l2x0_of_init(0, ~0);
- #endif
  
        if (of_machine_is_compatible("marvell,armada375"))
                hook_fault_code(16 + 6, armada_375_external_abort_wa, SIGBUS, 0,