1 files changed, 25 insertions, 14 deletions

diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
index b2058b432320..28ed52d58f7f 100644
--- a/drivers/mmc/host/mxcmmc.c
+++ b/drivers/mmc/host/mxcmmc.c
@@ -136,7 +136,8 @@ struct mxcmci_host {
         u16                     rev_no;
         unsigned int            cmdat;
 
-        struct clk              *clk;
+        struct clk              *clk_ipg;
+        struct clk              *clk_per;
 
         int                     clock;
 
@@ -672,7 +673,7 @@ static void mxcmci_set_clk_rate(struct mxcmci_host *host, unsigned int clk_ios)
 {
         unsigned int divider;
         int prescaler = 0;
-        unsigned int clk_in = clk_get_rate(host->clk);
+        unsigned int clk_in = clk_get_rate(host->clk_per);
 
         while (prescaler <= 0x800) {
                 for (divider = 1; divider <= 0xF; divider++) {
@@ -900,12 +901,20 @@ static int mxcmci_probe(struct platform_device *pdev)
         host->res = r;
         host->irq = irq;
 
-        host->clk = clk_get(&pdev->dev, NULL);
-        if (IS_ERR(host->clk)) {
-                ret = PTR_ERR(host->clk);
+        host->clk_ipg = devm_clk_get(&pdev->dev, "ipg");
+        if (IS_ERR(host->clk_ipg)) {
+                ret = PTR_ERR(host->clk_ipg);
                 goto out_iounmap;
         }
-        clk_enable(host->clk);
+
+        host->clk_per = devm_clk_get(&pdev->dev, "per");
+        if (IS_ERR(host->clk_per)) {
+                ret = PTR_ERR(host->clk_per);
+                goto out_iounmap;
+        }
+
+        clk_prepare_enable(host->clk_per);
+        clk_prepare_enable(host->clk_ipg);
 
         mxcmci_softreset(host);
 
@@ -917,8 +926,8 @@ static int mxcmci_probe(struct platform_device *pdev)
                 goto out_clk_put;
         }
 
-        mmc->f_min = clk_get_rate(host->clk) >> 16;
-        mmc->f_max = clk_get_rate(host->clk) >> 1;
+        mmc->f_min = clk_get_rate(host->clk_per) >> 16;
+        mmc->f_max = clk_get_rate(host->clk_per) >> 1;
 
         /* recommended in data sheet */
         writew(0x2db4, host->base + MMC_REG_READ_TO);
@@ -967,8 +976,8 @@ out_free_dma:
         if (host->dma)
                 dma_release_channel(host->dma);
 out_clk_put:
-        clk_disable(host->clk);
-        clk_put(host->clk);
+        clk_disable_unprepare(host->clk_per);
+        clk_disable_unprepare(host->clk_ipg);
 out_iounmap:
         iounmap(host->base);
 out_free:
@@ -999,8 +1008,8 @@ static int mxcmci_remove(struct platform_device *pdev)
         if (host->dma)
                 dma_release_channel(host->dma);
 
-        clk_disable(host->clk);
-        clk_put(host->clk);
+        clk_disable_unprepare(host->clk_per);
+        clk_disable_unprepare(host->clk_ipg);
 
         release_mem_region(host->res->start, resource_size(host->res));
 
@@ -1018,7 +1027,8 @@ static int mxcmci_suspend(struct device *dev)
 
         if (mmc)
                 ret = mmc_suspend_host(mmc);
-        clk_disable(host->clk);
+        clk_disable_unprepare(host->clk_per);
+        clk_disable_unprepare(host->clk_ipg);
 
         return ret;
 }
@@ -1029,7 +1039,8 @@ static int mxcmci_resume(struct device *dev)
         struct mxcmci_host *host = mmc_priv(mmc);
         int ret = 0;
 
-        clk_enable(host->clk);
+        clk_prepare_enable(host->clk_per);
+        clk_prepare_enable(host->clk_ipg);
         if (mmc)
                 ret = mmc_resume_host(mmc);