]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
mmc: sdhci-esdhc-imx: add clk_prepare/clk_unprepare
authorRichard Zhao <richard.zhao@linaro.org>
Tue, 15 Nov 2011 06:48:09 +0000 (14:48 +0800)
committerSascha Hauer <s.hauer@pengutronix.de>
Wed, 1 Feb 2012 13:29:31 +0000 (14:29 +0100)
It's for migrating to generic clk framework API.

Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
drivers/mmc/host/sdhci-esdhc-imx.c

index d601e41af282105ad5c3a86d30d569dfef3def8c..f4e82d45cafa592006d2bd50106f1da86717d2d9 100644 (file)
@@ -463,7 +463,7 @@ static int __devinit sdhci_esdhc_imx_probe(struct platform_device *pdev)
                err = PTR_ERR(clk);
                goto err_clk_get;
        }
-       clk_enable(clk);
+       clk_prepare_enable(clk);
        pltfm_host->clk = clk;
 
        if (!is_imx25_esdhc(imx_data))
@@ -558,7 +558,7 @@ no_card_detect_irq:
                gpio_free(boarddata->wp_gpio);
 no_card_detect_pin:
 no_board_data:
-       clk_disable(pltfm_host->clk);
+       clk_disable_unprepare(pltfm_host->clk);
        clk_put(pltfm_host->clk);
 err_clk_get:
        kfree(imx_data);
@@ -585,7 +585,7 @@ static int __devexit sdhci_esdhc_imx_remove(struct platform_device *pdev)
                gpio_free(boarddata->cd_gpio);
        }
 
-       clk_disable(pltfm_host->clk);
+       clk_disable_unprepare(pltfm_host->clk);
        clk_put(pltfm_host->clk);
        kfree(imx_data);