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
  ...

1 files changed, 28 insertions, 12 deletions

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index a472a29d8497..fb4f4990f5eb 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -323,7 +323,8 @@ 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;
         spinlock_t                      channel_0_lock;
         struct sdma_script_start_addrs  *script_addrs;
 };
@@ -867,7 +868,8 @@ static int sdma_alloc_chan_resources(struct dma_chan *chan)
         sdmac->peripheral_type = data->peripheral_type;
         sdmac->event_id0 = data->dma_request;
 
-        clk_enable(sdmac->sdma->clk);
+        clk_enable(sdmac->sdma->clk_ipg);
+        clk_enable(sdmac->sdma->clk_ahb);
 
         ret = sdma_request_channel(sdmac);
         if (ret)
@@ -904,7 +906,8 @@ static void sdma_free_chan_resources(struct dma_chan *chan)
 
         dma_free_coherent(NULL, PAGE_SIZE, sdmac->bd, sdmac->bd_phys);
 
-        clk_disable(sdma->clk);
+        clk_disable(sdma->clk_ipg);
+        clk_disable(sdma->clk_ahb);
 }
 
 static struct dma_async_tx_descriptor *sdma_prep_slave_sg(
@@ -1177,12 +1180,14 @@ static void sdma_load_firmware(const struct firmware *fw, void *context)
         addr = (void *)header + header->script_addrs_start;
         ram_code = (void *)header + header->ram_code_start;
 
-        clk_enable(sdma->clk);
+        clk_enable(sdma->clk_ipg);
+        clk_enable(sdma->clk_ahb);
         /* download the RAM image for SDMA */
         sdma_load_script(sdma, ram_code,
                         header->ram_code_size,
                         addr->ram_code_start_addr);
-        clk_disable(sdma->clk);
+        clk_disable(sdma->clk_ipg);
+        clk_disable(sdma->clk_ahb);
 
         sdma_add_scripts(sdma, addr);
 
@@ -1224,7 +1229,8 @@ static int __init sdma_init(struct sdma_engine *sdma)
                 return -ENODEV;
         }
 
-        clk_enable(sdma->clk);
+        clk_enable(sdma->clk_ipg);
+        clk_enable(sdma->clk_ahb);
 
         /* Be sure SDMA has not started yet */
         writel_relaxed(0, sdma->regs + SDMA_H_C0PTR);
@@ -1277,12 +1283,14 @@ static int __init sdma_init(struct sdma_engine *sdma)
         /* Initializes channel's priorities */
         sdma_set_channel_priority(&sdma->channel[0], 7);
 
-        clk_disable(sdma->clk);
+        clk_disable(sdma->clk_ipg);
+        clk_disable(sdma->clk_ahb);
 
         return 0;
 
 err_dma_alloc:
-        clk_disable(sdma->clk);
+        clk_disable(sdma->clk_ipg);
+        clk_disable(sdma->clk_ahb);
         dev_err(sdma->dev, "initialisation failed with %d\n", ret);
         return ret;
 }
@@ -1321,12 +1329,21 @@ static int __init sdma_probe(struct platform_device *pdev)
                 goto err_request_region;
         }
 
-        sdma->clk = clk_get(&pdev->dev, NULL);
-        if (IS_ERR(sdma->clk)) {
-                ret = PTR_ERR(sdma->clk);
+        sdma->clk_ipg = devm_clk_get(&pdev->dev, "ipg");
+        if (IS_ERR(sdma->clk_ipg)) {
+                ret = PTR_ERR(sdma->clk_ipg);
                 goto err_clk;
         }
 
+        sdma->clk_ahb = devm_clk_get(&pdev->dev, "ahb");
+        if (IS_ERR(sdma->clk_ahb)) {
+                ret = PTR_ERR(sdma->clk_ahb);
+                goto err_clk;
+        }
+
+        clk_prepare(sdma->clk_ipg);
+        clk_prepare(sdma->clk_ahb);
+
         sdma->regs = ioremap(iores->start, resource_size(iores));
         if (!sdma->regs) {
                 ret = -ENOMEM;
@@ -1436,7 +1453,6 @@ err_alloc:
 err_request_irq:
         iounmap(sdma->regs);
 err_ioremap:
-        clk_put(sdma->clk);
 err_clk:
         release_mem_region(iores->start, resource_size(iores));
 err_request_region: