aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-omap-100k.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-07-10 11:09:22 -0400
committerMark Brown <broonie@linaro.org>2013-07-15 06:39:31 -0400
commit13cd19e855437254fe38b8522584f3a0738b0884 (patch)
tree38d678ffb008cdcd3dc86c1da38e42e6c50f25ec /drivers/spi/spi-omap-100k.c
parent022a9412ec056026739c15df90e947b67d1b8222 (diff)
spi/omap-100k: Prepare and unprepare clocks
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/spi/spi-omap-100k.c')
-rw-r--r--drivers/spi/spi-omap-100k.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/spi/spi-omap-100k.c b/drivers/spi/spi-omap-100k.c
index 691ef3f199ff..3590dd43837b 100644
--- a/drivers/spi/spi-omap-100k.c
+++ b/drivers/spi/spi-omap-100k.c
@@ -303,13 +303,13 @@ static int omap1_spi100k_setup(struct spi_device *spi)
303 303
304 spi100k_open(spi->master); 304 spi100k_open(spi->master);
305 305
306 clk_enable(spi100k->ick); 306 clk_prepare_enable(spi100k->ick);
307 clk_enable(spi100k->fck); 307 clk_prepare_enable(spi100k->fck);
308 308
309 ret = omap1_spi100k_setup_transfer(spi, NULL); 309 ret = omap1_spi100k_setup_transfer(spi, NULL);
310 310
311 clk_disable(spi100k->ick); 311 clk_disable_unprepare(spi100k->ick);
312 clk_disable(spi100k->fck); 312 clk_disable_unprepare(spi100k->fck);
313 313
314 return ret; 314 return ret;
315} 315}
@@ -318,8 +318,8 @@ static int omap1_spi100k_prepare_hardware(struct spi_master *master)
318{ 318{
319 struct omap1_spi100k *spi100k = spi_master_get_devdata(master); 319 struct omap1_spi100k *spi100k = spi_master_get_devdata(master);
320 320
321 clk_enable(spi100k->ick); 321 clk_prepare_enable(spi100k->ick);
322 clk_enable(spi100k->fck); 322 clk_prepare_enable(spi100k->fck);
323 323
324 return 0; 324 return 0;
325} 325}
@@ -396,8 +396,8 @@ static int omap1_spi100k_unprepare_hardware(struct spi_master *master)
396{ 396{
397 struct omap1_spi100k *spi100k = spi_master_get_devdata(master); 397 struct omap1_spi100k *spi100k = spi_master_get_devdata(master);
398 398
399 clk_disable(spi100k->ick); 399 clk_disable_unprepare(spi100k->ick);
400 clk_disable(spi100k->fck); 400 clk_disable_unprepare(spi100k->fck);
401 401
402 return 0; 402 return 0;
403} 403}