spi: dw-mmio: prepare the clock before enabling

This is required for common clock support.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/drivers/spi/spi-dw-mmio.c b/drivers/spi/spi-dw-mmio.c
index 569adf877b160d3481feb6dd6348eb52010ab7de..9af56cdf1540551d595409efc47533cf45c5e5c5 100644 (file)
--- a/drivers/spi/spi-dw-mmio.c
+++ b/drivers/spi/spi-dw-mmio.c
@@ -62,7 +62,7 @@ static int dw_spi_mmio_probe(struct platform_device *pdev)
        dwsmmio->clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(dwsmmio->clk))
                return PTR_ERR(dwsmmio->clk);
-       ret = clk_enable(dwsmmio->clk);
+       ret = clk_prepare_enable(dwsmmio->clk);
        if (ret)
                return ret;
 
@@ -78,7 +78,7 @@ static int dw_spi_mmio_probe(struct platform_device *pdev)
        return 0;
 
 out:
-       clk_disable(dwsmmio->clk);
+       clk_disable_unprepare(dwsmmio->clk);
        return ret;
 }
 
@@ -86,7 +86,7 @@ static int dw_spi_mmio_remove(struct platform_device *pdev)
 {
        struct dw_spi_mmio *dwsmmio = platform_get_drvdata(pdev);
 
-       clk_disable(dwsmmio->clk);
+       clk_disable_unprepare(dwsmmio->clk);
        dw_spi_remove_host(&dwsmmio->dws);
 
        return 0;