TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spi/sirf: use clk_prepare_enable and clk_disable_unprepare

Browse Source 
Convert clk_enable/clk_disable to clk_prepare_enable/clk_disable_unprepare
calls as required by common clock framework.

Signed-off-by: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
Barry Song
2012-12-26 10:48:33 +08:00
committed by Grant Likely
parent f305a0a8d7
commit e5118cd2c2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/spi/spi-sirf.c
+3 -3
View File
@@ -569,7 +569,7 @@ static int spi_sirfsoc_probe(struct platform_device *pdev)
ret = -EINVAL; ret = -EINVAL;
goto free_pin; goto free_pin;
} }
clk_enable(sspi->clk); clk_prepare_enable(sspi->clk);
sspi->ctrl_freq = clk_get_rate(sspi->clk); sspi->ctrl_freq = clk_get_rate(sspi->clk);
init_completion(&sspi->done); init_completion(&sspi->done);
@@ -593,7 +593,7 @@ static int spi_sirfsoc_probe(struct platform_device *pdev)
return 0; return 0;
free_clk: free_clk:
clk_disable(sspi->clk); clk_disable_unprepare(sspi->clk);
clk_put(sspi->clk); clk_put(sspi->clk);
free_pin: free_pin:
pinctrl_put(sspi->p); pinctrl_put(sspi->p);
@@ -617,7 +617,7 @@ static int spi_sirfsoc_remove(struct platform_device *pdev)
if (sspi->chipselect[i] > 0) if (sspi->chipselect[i] > 0)
gpio_free(sspi->chipselect[i]); gpio_free(sspi->chipselect[i]);
} }
clk_disable(sspi->clk); clk_disable_unprepare(sspi->clk);
clk_put(sspi->clk); clk_put(sspi->clk);
pinctrl_put(sspi->p); pinctrl_put(sspi->p);
spi_master_put(master); spi_master_put(master);