Merge branch 'mvebu/seb_clk' into for-next

diff --cc arch/arm/mach-kirkwood/Kconfig
Simple merge

diff --cc arch/arm/mach-kirkwood/board-dt.c
Simple merge

diff --cc arch/arm/mach-mvebu/Kconfig
index fb827ac9d906291aa58d92584d0845a9708d3609,ef4e21cf36bfc4d6edc125ddc7af5288524bb421..9eb63d7246023e061ff80a91b2a600f691906c58
--- 1/arch/arm/mach-mvebu/Kconfig
--- 2/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@@ -10,12 -10,8 +10,9 @@@ config ARCH_MVEB
        select PLAT_ORION
        select SPARSE_IRQ
        select CLKDEV_LOOKUP
-       select MVEBU_CLK_CORE
-       select MVEBU_CLK_CPU
-       select MVEBU_CLK_GATING
        select MVEBU_MBUS
        select ZONE_DMA if ARM_LPAE
 +      select ARCH_REQUIRE_GPIOLIB
        select MIGHT_HAVE_PCI
        select PCI_QUIRKS if PCI
  

diff --cc arch/arm/mach-mvebu/armada-370-xp.c
index cf8e357a0a0275754fd7c4b64ceca947409aa40c,1d018e420208d62b42789e1d6d07f4777f927f0c..8721e2d26066c1434724080b4813013cd35b1911
--- 1/arch/arm/mach-mvebu/armada-370-xp.c
--- 2/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@@ -17,9 -18,9 +18,8 @@@
  #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>
@@@ -42,9 -43,9 +42,9 @@@ static void __init armada_370_xp_map_io
        iotable_init(armada_370_xp_io_desc, ARRAY_SIZE(armada_370_xp_io_desc));
  }
  
 -void __init armada_370_xp_timer_and_clk_init(void)
 +static void __init armada_370_xp_timer_and_clk_init(void)
  {
-       mvebu_clocks_init();
+       of_clk_init(NULL);
        armada_370_xp_timer_init();
  }