Merge tag 'seb_clk-3.11' of git://git.infradead.org/users/jcooper/linux into next/soc

From Jason Cooper:
mvebu clock restructuring for v3.11

 - clk: mvebu
    - reorganize by SoC to remove built up #ifdefs
    - add clk flags per clock gate

* tag 'seb_clk-3.11' of git://git.infradead.org/users/jcooper/linux:
  clk: mvebu: disintegrate obsolete file
  ARM: mvebu: move DT boards to SoC-centric clock init
  ARM: kirkwood: move DT boards to SoC-centric clock init
  ARM: dove: move DT boards to SoC-centric clock init
  clk: mvebu: add Armada XP SoC-centric clock init
  clk: mvebu: add Armada 370 SoC-centric clock init
  clk: mvebu: add Kirkwood SoC-centric clock init
  clk: mvebu: add Dove SoC-centric clock init
  clk: mvebu: add common clock functions for core clk and clk gating
  clk: mvebu: introduce per-clock-gate flags

diff --combined arch/arm/mach-kirkwood/Kconfig
index b56bd3d7ece35ad56f5c2ae6ce59c76901220d4f,79ee9f25760fede8d7ceed2030d127289252476f..e610e137aa3635d345c5683cbf3ca0c596a18c71
--- 1/arch/arm/mach-kirkwood/Kconfig
--- 2/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
@@@ -8,6 -8,12 +8,6 @@@ config MACH_D2NET_V
          Say 'Y' here if you want your kernel to support the
          LaCie d2 Network v2 NAS.
  
 -config MACH_DB88F6281_BP
 -      bool "Marvell DB-88F6281-BP Development Board"
 -      help
 -        Say 'Y' here if you want your kernel to support the
 -        Marvell DB-88F6281-BP Development Board.
 -
  config MACH_DOCKSTAR
        bool "Seagate FreeAgent DockStar"
        help
@@@ -128,13 -134,12 +128,12 @@@ comment "Device tree entries
  
  config ARCH_KIRKWOOD_DT
        bool "Marvell Kirkwood Flattened Device Tree"
+       select KIRKWOOD_CLK
        select POWER_SUPPLY
        select POWER_RESET
        select POWER_RESET_GPIO
        select REGULATOR
        select REGULATOR_FIXED_VOLTAGE
-       select MVEBU_CLK_CORE
-       select MVEBU_CLK_GATING
        select USE_OF
        help
          Say 'Y' here if you want your kernel to support the
@@@ -147,13 -152,6 +146,13 @@@ config MACH_CLOUDBOX_D
          Say 'Y' here if you want your kernel to support the LaCie
          CloudBox NAS, using Flattened Device Tree.
  
 +config MACH_DB88F628X_BP_DT
 +      bool "Marvell DB-88F628x-BP Development Board (Flattened Device Tree)"
 +      help
 +        Say 'Y' here if you want your kernel to support the Marvell
 +        DB-88F6281-BP and DB-88F6282-BP Development Board (Flattened
 +        Device Tree).
 +
  config MACH_DLINK_KIRKWOOD_DT
        bool "D-Link Kirkwood-based NAS (Flattened Device Tree)"
        select ARCH_KIRKWOOD_DT
@@@ -273,6 -271,14 +272,6 @@@ config MACH_NETSPACE_V2_D
          Say 'Y' here if you want your kernel to support the LaCie
          Network Space v2 NAS, using Flattened Device Tree.
  
 -config MACH_NSA310_DT
 -      bool "ZyXEL NSA-310 (Flattened Device Tree)"
 -      select ARCH_KIRKWOOD_DT
 -      select ARM_ATAG_DTB_COMPAT
 -      help
 -        Say 'Y' here if you want your kernel to support the
 -        ZyXEL NSA-310 board (Flattened Device Tree).
 -
  config MACH_OPENBLOCKS_A6_DT
        bool "Plat'Home OpenBlocks A6 (Flattened Device Tree)"
        select ARCH_KIRKWOOD_DT

diff --combined arch/arm/mach-kirkwood/board-dt.c
index 57d4fa11a90f10268a3f331dace276fa09f5ce7b,2f695e5b1ec77e3b07bbd46096a68718ed723a20..cee5dc71cb60aa5d9bc443a93c27805a9b478f01
--- 1/arch/arm/mach-kirkwood/board-dt.c
--- 2/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@@ -15,7 -15,6 +15,6 @@@
  #include <linux/of.h>
  #include <linux/of_platform.h>
  #include <linux/clk-provider.h>
- #include <linux/clk/mvebu.h>
  #include <linux/kexec.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
@@@ -25,6 -24,11 +24,6 @@@
  #include <plat/common.h>
  #include "common.h"
  
 -static struct of_device_id kirkwood_dt_match_table[] __initdata = {
 -      { .compatible = "simple-bus", },
 -      { }
 -};
 -
  /*
   * 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
@@@ -72,7 -76,7 +71,7 @@@ static void __init kirkwood_legacy_clk_
  
  static void __init kirkwood_of_clk_init(void)
  {
-       mvebu_clocks_init();
+       of_clk_init(NULL);
        kirkwood_legacy_clk_init();
  }
  
@@@ -92,8 -96,6 +91,8 @@@ static void __init kirkwood_dt_init(voi
  
        kirkwood_l2_init();
  
 +      kirkwood_cpufreq_init();
 +
        /* Setup root of clk tree */
        kirkwood_of_clk_init();
  
@@@ -144,10 -146,6 +143,10 @@@
            of_machine_is_compatible("lacie,netspace_v2"))
                ns2_init();
  
 +      if (of_machine_is_compatible("marvell,db-88f6281-bp") ||
 +          of_machine_is_compatible("marvell,db-88f6282-bp"))
 +              db88f628x_init();
 +
        if (of_machine_is_compatible("mpl,cec4"))
                mplcec4_init();
  
@@@ -160,7 -158,7 +159,7 @@@
        if (of_machine_is_compatible("usi,topkick"))
                usi_topkick_init();
  
 -      of_platform_populate(NULL, kirkwood_dt_match_table, NULL, NULL);
 +      of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
  }
  
  static const char * const kirkwood_dt_board_compat[] = {
@@@ -182,8 -180,6 +181,8 @@@
        "lacie,netspace_max_v2",
        "lacie,netspace_mini_v2",
        "lacie,netspace_v2",
 +      "marvell,db-88f6281-bp",
 +      "marvell,db-88f6282-bp",
        "mpl,cec4",
        "netgear,readynas-duo-v2",
        "plathome,openblocks-a6",

diff --combined 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
  
@@@ -32,6 -28,7 +29,7 @@@ config MACH_ARMADA_370_X
  
  config MACH_ARMADA_370
        bool "Marvell Armada 370 boards"
+       select ARMADA_370_CLK
        select MACH_ARMADA_370_XP
        select PINCTRL_ARMADA_370
        help
@@@ -40,6 -37,7 +38,7 @@@
  
  config MACH_ARMADA_XP
        bool "Marvell Armada XP boards"
+       select ARMADA_XP_CLK
        select MACH_ARMADA_370_XP
        select PINCTRL_ARMADA_XP
        help

diff --combined arch/arm/mach-mvebu/armada-370-xp.c
index 1c48890bb72b2c7ad1301cdc9f8bad007362bf57,1d018e420208d62b42789e1d6d07f4777f927f0c..ebbc997397263edac246e71fbfda9d5964b75f74
--- 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
@@@ -14,10 -14,10 +14,10 @@@
  
  #include <linux/kernel.h>
  #include <linux/init.h>
+ #include <linux/clk-provider.h>
  #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>
@@@ -45,7 -45,7 +45,7 @@@ void __init armada_370_xp_map_io(void
  
  void __init armada_370_xp_timer_and_clk_init(void)
  {
-       mvebu_clocks_init();
+       of_clk_init(NULL);
        armada_370_xp_timer_init();
  }
  
@@@ -53,6 -53,13 +53,6 @@@ void __init armada_370_xp_init_early(vo
  {
        char *mbus_soc_name;
  
 -      /*
 -       * Some Armada 370/XP devices allocate their coherent buffers
 -       * from atomic context. Increase size of atomic coherent pool
 -       * to make sure such the allocations won't fail.
 -       */
 -      init_dma_coherent_pool_size(SZ_1M);
 -
        /*
         * This initialization will be replaced by a DT-based
         * initialization once the mvebu-mbus driver gains DT support.