Commit 17fe0d9a authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Mark Brown

spi: rspi: Convert to clk_prepare_enable/disable_unprepare

Get the driver ready for the migration to the common clock framework by
calling clk_prepare_enable() and clk_disable_unprepare().
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@linux-m68k.org>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 06a7a3cf
...@@ -980,7 +980,7 @@ static int rspi_remove(struct platform_device *pdev) ...@@ -980,7 +980,7 @@ static int rspi_remove(struct platform_device *pdev)
struct rspi_data *rspi = platform_get_drvdata(pdev); struct rspi_data *rspi = platform_get_drvdata(pdev);
rspi_release_dma(rspi); rspi_release_dma(rspi);
clk_disable(rspi->clk); clk_disable_unprepare(rspi->clk);
return 0; return 0;
} }
...@@ -1041,7 +1041,12 @@ static int rspi_probe(struct platform_device *pdev) ...@@ -1041,7 +1041,12 @@ static int rspi_probe(struct platform_device *pdev)
ret = PTR_ERR(rspi->clk); ret = PTR_ERR(rspi->clk);
goto error1; goto error1;
} }
clk_enable(rspi->clk);
ret = clk_prepare_enable(rspi->clk);
if (ret < 0) {
dev_err(&pdev->dev, "unable to prepare/enable clock\n");
goto error1;
}
init_waitqueue_head(&rspi->wait); init_waitqueue_head(&rspi->wait);
...@@ -1112,7 +1117,7 @@ static int rspi_probe(struct platform_device *pdev) ...@@ -1112,7 +1117,7 @@ static int rspi_probe(struct platform_device *pdev)
error3: error3:
rspi_release_dma(rspi); rspi_release_dma(rspi);
error2: error2:
clk_disable(rspi->clk); clk_disable_unprepare(rspi->clk);
error1: error1:
spi_master_put(master); spi_master_put(master);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment