1 files changed, 19 insertions, 11 deletions

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 69c9a6601f45..47877d687614 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -86,7 +86,8 @@ struct spi_imx_data {
         struct completion xfer_done;
         void __iomem *base;
         int irq;
-        struct clk *clk;
+        struct clk *clk_per;
+        struct clk *clk_ipg;
         unsigned long spi_clk;
 
         unsigned int count;
@@ -853,15 +854,22 @@ static int __devinit spi_imx_probe(struct platform_device *pdev)
                 goto out_free_irq;
         }
 
-        spi_imx->clk = clk_get(&pdev->dev, NULL);
-        if (IS_ERR(spi_imx->clk)) {
-                dev_err(&pdev->dev, "unable to get clock\n");
-                ret = PTR_ERR(spi_imx->clk);
+        spi_imx->clk_ipg = devm_clk_get(&pdev->dev, "ipg");
+        if (IS_ERR(spi_imx->clk_ipg)) {
+                ret = PTR_ERR(spi_imx->clk_ipg);
                 goto out_free_irq;
         }
 
-        clk_enable(spi_imx->clk);
-        spi_imx->spi_clk = clk_get_rate(spi_imx->clk);
+        spi_imx->clk_per = devm_clk_get(&pdev->dev, "per");
+        if (IS_ERR(spi_imx->clk_per)) {
+                ret = PTR_ERR(spi_imx->clk_per);
+                goto out_free_irq;
+        }
+
+        clk_prepare_enable(spi_imx->clk_per);
+        clk_prepare_enable(spi_imx->clk_ipg);
+
+        spi_imx->spi_clk = clk_get_rate(spi_imx->clk_per);
 
         spi_imx->devtype_data->reset(spi_imx);
 
@@ -879,8 +887,8 @@ static int __devinit spi_imx_probe(struct platform_device *pdev)
         return ret;
 
 out_clk_put:
-        clk_disable(spi_imx->clk);
-        clk_put(spi_imx->clk);
+        clk_disable_unprepare(spi_imx->clk_per);
+        clk_disable_unprepare(spi_imx->clk_ipg);
 out_free_irq:
         free_irq(spi_imx->irq, spi_imx);
 out_iounmap:
@@ -908,8 +916,8 @@ static int __devexit spi_imx_remove(struct platform_device *pdev)
         spi_bitbang_stop(&spi_imx->bitbang);
 
         writel(0, spi_imx->base + MXC_CSPICTRL);
-        clk_disable(spi_imx->clk);
-        clk_put(spi_imx->clk);
+        clk_disable_unprepare(spi_imx->clk_per);
+        clk_disable_unprepare(spi_imx->clk_ipg);
         free_irq(spi_imx->irq, spi_imx);
         iounmap(spi_imx->base);