Merge tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull arm-soc clock driver changes from Olof Johansson:
 "The new clock subsystem was merged in linux-3.4 without any users,
  this now moves the first three platforms over to it: imx, mxs and
  spear.

  The series also contains the changes for the clock subsystem itself,
  since Mike preferred to have it together with the platforms that
  require these changes, in order to avoid interdependencies and
  conflicts."

Fix up trivial conflicts in arch/arm/mach-kirkwood/common.c (code
removed in one branch, added OF support in another) and
drivers/dma/imx-sdma.c (independent changes next to each other).

* tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (97 commits)
  clk: Fix CLK_SET_RATE_GATE flag validation in clk_set_rate().
  clk: Provide dummy clk_unregister()
  SPEAr: Update defconfigs
  SPEAr: Add SMI NOR partition info in dts files
  SPEAr: Switch to common clock framework
  SPEAr: Call clk_prepare() before calling clk_enable
  SPEAr: clk: Add General Purpose Timer Synthesizer clock
  SPEAr: clk: Add Fractional Synthesizer clock
  SPEAr: clk: Add Auxiliary Synthesizer clock
  SPEAr: clk: Add VCO-PLL Synthesizer clock
  SPEAr: Add DT bindings for SPEAr's timer
  ARM i.MX: remove now unused clock files
  ARM: i.MX6: implement clocks using common clock framework
  ARM i.MX35: implement clocks using common clock framework
  ARM i.MX5: implement clocks using common clock framework
  ARM: Kirkwood: Replace clock gating
  ARM: Orion: Audio: Add clk/clkdev support
  ARM: Orion: PCIE: Add support for clk
  ARM: Orion: XOR: Add support for clk
  ARM: Orion: CESA: Add support for clk
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-dove/common.c
Simple merge

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

diff --cc arch/arm/mach-imx/Makefile
Simple merge

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

diff --cc arch/arm/mach-kirkwood/common.h
Simple merge

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

diff --cc arch/arm/mach-orion5x/common.c
Simple merge

diff --cc arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
Simple merge

diff --cc drivers/dma/imx-sdma.c
index a472a29d84971e9f9ffdf5a860392b3535c081a6,fddccae6b47660ce68a3fd7dc72c6625d87a180a..fb4f4990f5ebf9f6c8e1f97c9704f8b03642bd18
--- 1/drivers/dma/imx-sdma.c
--- 2/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@@ -323,8 -322,9 +323,9 @@@ struct sdma_engine 
        struct sdma_context_data        *context;
        dma_addr_t                      context_phys;
        struct dma_device               dma_device;
-       struct clk                      *clk;
+       struct clk                      *clk_ipg;
+       struct clk                      *clk_ahb;
 -      struct mutex                    channel_0_lock;
 +      spinlock_t                      channel_0_lock;
        struct sdma_script_start_addrs  *script_addrs;
  };
  

diff --cc drivers/media/video/mx3_camera.c
Simple merge

diff --cc drivers/mmc/host/sdhci-esdhc-imx.c
Simple merge

diff --cc drivers/mtd/nand/orion_nand.c
index 0f50ef38b87b4e814e1be5ee8baf211afd3b3f51,fdc4786ea3e57e8c421c58cd531516c451e65cd9..513dc88a05ca422ac23525dac7db3f20ef9b0bfc
--- 1/drivers/mtd/nand/orion_nand.c
--- 2/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/orion_nand.c
@@@ -79,9 -79,9 +81,10 @@@ static int __init orion_nand_probe(stru
        struct nand_chip *nc;
        struct orion_nand_data *board;
        struct resource *res;
+       struct clk *clk;
        void __iomem *io_base;
        int ret = 0;
 +      u32 val = 0;
  
        nc = kzalloc(sizeof(struct nand_chip) + sizeof(struct mtd_info), GFP_KERNEL);
        if (!nc) {

diff --cc drivers/net/ethernet/freescale/fec.c
Simple merge

diff --cc drivers/net/ethernet/marvell/mv643xx_eth.c
Simple merge