2 files changed, 31 insertions, 15 deletions

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index d3e38e28bb6b..fddccae6b476 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -322,7 +322,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;
         struct mutex                    channel_0_lock;
         struct sdma_script_start_addrs  *script_addrs;
 };
@@ -859,7 +860,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)
@@ -896,7 +898,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(
@@ -1169,12 +1172,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);
 
@@ -1216,7 +1221,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);
@@ -1269,12 +1275,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;
 }
@@ -1313,12 +1321,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;
@@ -1426,7 +1443,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:
diff --git a/drivers/dma/ipu/ipu_idmac.c b/drivers/dma/ipu/ipu_idmac.c
index 62e3f8ec2461..5ec72044ea4c 100644
--- a/drivers/dma/ipu/ipu_idmac.c
+++ b/drivers/dma/ipu/ipu_idmac.c
@@ -1715,7 +1715,7 @@ static int __init ipu_probe(struct platform_device *pdev)
         }
 
         /* Make sure IPU HSP clock is running */
-        clk_enable(ipu_data.ipu_clk);
+        clk_prepare_enable(ipu_data.ipu_clk);
 
         /* Disable all interrupts */
         idmac_write_ipureg(&ipu_data, 0, IPU_INT_CTRL_1);
@@ -1747,7 +1747,7 @@ static int __init ipu_probe(struct platform_device *pdev)
 err_idmac_init:
 err_attach_irq:
         ipu_irq_detach_irq(&ipu_data, pdev);
-        clk_disable(ipu_data.ipu_clk);
+        clk_disable_unprepare(ipu_data.ipu_clk);
         clk_put(ipu_data.ipu_clk);
 err_clk_get:
         iounmap(ipu_data.reg_ic);
@@ -1765,7 +1765,7 @@ static int __exit ipu_remove(struct platform_device *pdev)
 
         ipu_idmac_exit(ipu);
         ipu_irq_detach_irq(ipu, pdev);
-        clk_disable(ipu->ipu_clk);
+        clk_disable_unprepare(ipu->ipu_clk);
         clk_put(ipu->ipu_clk);
         iounmap(ipu->reg_ic);
         iounmap(ipu->reg_ipu);