redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

spi: spi-txx9: Add missing clock (un)prepare calls for CCF 

While the custom minimal TXx9 clock implementation doesn't need or use
clock (un)prepare calls (they are dummies if !CONFIG_HAVE_CLK_PREPARE),
they are mandatory when using the Common Clock Framework.

Hence add them, to prepare for the advent of CCF.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
steinar/wifi_calib_4_9_kernel
Geert Uytterhoeven 2016-08-18 19:34:25 +02:00 committed by Mark Brown
parent 29b4817d40
commit 1ae4ec1415
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/spi/spi-txx9.c
View File

@ -346,7 +346,7 @@ static int txx9spi_probe(struct platform_device *dev)
c->clk = NULL; c->clk = NULL;
goto exit; goto exit;
} }
ret = clk_enable(c->clk); ret = clk_prepare_enable(c->clk);
if (ret) { if (ret) {
c->clk = NULL; c->clk = NULL;
goto exit; goto exit;
@ -395,7 +395,7 @@ static int txx9spi_probe(struct platform_device *dev)
exit_busy: exit_busy:
ret = -EBUSY; ret = -EBUSY;
exit: exit:
clk_disable(c->clk); clk_disable_unprepare(c->clk);
spi_master_put(master); spi_master_put(master);
return ret; return ret;
} }
@ -406,7 +406,7 @@ static int txx9spi_remove(struct platform_device *dev)
struct txx9spi *c = spi_master_get_devdata(master); struct txx9spi *c = spi_master_get_devdata(master);
flush_work(&c->work); flush_work(&c->work);
clk_disable(c->clk); clk_disable_unprepare(c->clk);
return 0; return 0;
} }