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

Conflicts:
	arch/arm/mach-kirkwood/board-dt.c

diff --combined arch/arm/mach-kirkwood/board-dt.c
index 9caa4fe95913c672a6b874c5b8b8d573294ae857,44bc6b997a099d3fa09abb26ef370d9bd581895b..ab2e586e04c7bbf880310304be99d26f4dbaf77f
--- 1/arch/arm/mach-kirkwood/board-dt.c
--- 2/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@@ -10,55 -10,22 +10,21 @@@
   * warranty of any kind, whether express or implied.
   */
  
+ #include <linux/clk.h>
  #include <linux/kernel.h>
  #include <linux/init.h>
+ #include <linux/io.h>
  #include <linux/of.h>
  #include <linux/of_address.h>
  #include <linux/of_net.h>
  #include <linux/of_platform.h>
  #include <linux/clk-provider.h>
- #include <linux/dma-mapping.h>
- #include <linux/irqchip.h>
- #include <linux/kexec.h>
 -#include <linux/clocksource.h>
+ #include <linux/slab.h>
  #include <asm/mach/arch.h>
- #include <asm/mach/map.h>
  #include <mach/bridge-regs.h>
- #include <linux/platform_data/usb-ehci-orion.h>
- #include <plat/irq.h>
  #include <plat/common.h>
  #include "common.h"
  
- /*
-  * There are still devices that doesn't know about DT yet.  Get clock
-  * gates here and add a clock lookup alias, so that old platform
-  * devices still work.
- */
- 
- static void __init kirkwood_legacy_clk_init(void)
- {
- 
-       struct device_node *np = of_find_compatible_node(
-               NULL, NULL, "marvell,kirkwood-gating-clock");
-       struct of_phandle_args clkspec;
-       struct clk *clk;
- 
-       clkspec.np = np;
-       clkspec.args_count = 1;
- 
-       /*
-        * The ethernet interfaces forget the MAC address assigned by
-        * u-boot if the clocks are turned off. Until proper DT support
-        * is available we always enable them for now.
-        */
-       clkspec.args[0] = CGC_BIT_GE0;
-       clk = of_clk_get_from_provider(&clkspec);
-       clk_prepare_enable(clk);
- 
-       clkspec.args[0] = CGC_BIT_GE1;
-       clk = of_clk_get_from_provider(&clkspec);
-       clk_prepare_enable(clk);
- }
- 
  #define MV643XX_ETH_MAC_ADDR_LOW      0x0414
  #define MV643XX_ETH_MAC_ADDR_HIGH     0x0418
  
@@@ -138,6 -105,12 +104,6 @@@ eth_fixup_skip
        }
  }
  
 -static void __init kirkwood_dt_time_init(void)
 -{
 -      of_clk_init(NULL);
 -      clocksource_of_init();
 -}
 -
  static void __init kirkwood_dt_init(void)
  {
        pr_info("Kirkwood: %s, TCLK=%d.\n", kirkwood_id(), kirkwood_tclk);
@@@ -156,8 -129,6 +122,6 @@@
  
        kirkwood_cpufreq_init();
        kirkwood_cpuidle_init();
-       /* Setup clocks for legacy devices */
-       kirkwood_legacy_clk_init();
  
        kirkwood_pm_init();
        kirkwood_dt_eth_fixup();
@@@ -180,6 -151,7 +144,6 @@@ static const char * const kirkwood_dt_b
  DT_MACHINE_START(KIRKWOOD_DT, "Marvell Kirkwood (Flattened Device Tree)")
        /* Maintainer: Jason Cooper <jason@lakedaemon.net> */
        .map_io         = kirkwood_map_io,
 -      .init_time      = kirkwood_dt_time_init,
        .init_machine   = kirkwood_dt_init,
        .restart        = kirkwood_restart,
        .dt_compat      = kirkwood_dt_board_compat,