aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaruch Siach <baruch@tkos.co.il>2013-12-30 13:30:45 -0500
committerMark Brown <broonie@linaro.org>2013-12-31 07:30:22 -0500
commit020fe3fe11255cc3d8e67d5e53705c48deb19376 (patch)
treea6c977c63929b67011349d0c76e33baf84433d34
parent04f421e7b0b10de3fae543dac4d324b449a1db6b (diff)
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>
-rw-r--r--drivers/spi/spi-dw-mmio.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi-dw-mmio.c b/drivers/spi/spi-dw-mmio.c
index 569adf877b16..9af56cdf1540 100644
--- 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)
62 dwsmmio->clk = devm_clk_get(&pdev->dev, NULL); 62 dwsmmio->clk = devm_clk_get(&pdev->dev, NULL);
63 if (IS_ERR(dwsmmio->clk)) 63 if (IS_ERR(dwsmmio->clk))
64 return PTR_ERR(dwsmmio->clk); 64 return PTR_ERR(dwsmmio->clk);
65 ret = clk_enable(dwsmmio->clk); 65 ret = clk_prepare_enable(dwsmmio->clk);
66 if (ret) 66 if (ret)
67 return ret; 67 return ret;
68 68
@@ -78,7 +78,7 @@ static int dw_spi_mmio_probe(struct platform_device *pdev)
78 return 0; 78 return 0;
79 79
80out: 80out:
81 clk_disable(dwsmmio->clk); 81 clk_disable_unprepare(dwsmmio->clk);
82 return ret; 82 return ret;
83} 83}
84 84
@@ -86,7 +86,7 @@ static int dw_spi_mmio_remove(struct platform_device *pdev)
86{ 86{
87 struct dw_spi_mmio *dwsmmio = platform_get_drvdata(pdev); 87 struct dw_spi_mmio *dwsmmio = platform_get_drvdata(pdev);
88 88
89 clk_disable(dwsmmio->clk); 89 clk_disable_unprepare(dwsmmio->clk);
90 dw_spi_remove_host(&dwsmmio->dws); 90 dw_spi_remove_host(&dwsmmio->dws);
91 91
92 return 0; 92 return 0;