MLK-9817 spi: imx: convert all clk_enable to clk_prepare_enable

This is done in preperation for low power mode. Convert all clk_enable
to clk_prepare_enable and clk_disable to clk_disable_unprepare. Make sure
PLL3 power down when entering low power mode.

Signed-off-by: Bai Ping <b51503@freescale.com>
(cherry picked from commit 1808b31fdae576e775159a05cde9b45e404bb6e2)

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index cd05851..306f0d5 100644 (file)
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -1117,13 +1117,13 @@ spi_imx_prepare_message(struct spi_master *master, struct spi_message *msg)
        struct spi_imx_data *spi_imx = spi_master_get_devdata(master);
        int ret;
 
-       ret = clk_enable(spi_imx->clk_per);
+       ret = clk_prepare_enable(spi_imx->clk_per);
        if (ret)
                return ret;
 
-       ret = clk_enable(spi_imx->clk_ipg);
+       ret = clk_prepare_enable(spi_imx->clk_ipg);
        if (ret) {
-               clk_disable(spi_imx->clk_per);
+               clk_disable_unprepare(spi_imx->clk_per);
                return ret;
        }
 
@@ -1135,8 +1135,8 @@ spi_imx_unprepare_message(struct spi_master *master, struct spi_message *msg)
 {
        struct spi_imx_data *spi_imx = spi_master_get_devdata(master);
 
-       clk_disable(spi_imx->clk_ipg);
-       clk_disable(spi_imx->clk_per);
+       clk_disable_unprepare(spi_imx->clk_ipg);
+       clk_disable_unprepare(spi_imx->clk_per);
        return 0;
 }
 
@@ -1285,8 +1285,8 @@ static int spi_imx_probe(struct platform_device *pdev)
 
        dev_info(&pdev->dev, "probed\n");
 
-       clk_disable(spi_imx->clk_ipg);
-       clk_disable(spi_imx->clk_per);
+       clk_disable_unprepare(spi_imx->clk_ipg);
+       clk_disable_unprepare(spi_imx->clk_per);
        return ret;
 
 out_clk_put: