aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeepak Sikri <deepak.sikri@st.com>2012-12-17 19:02:32 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-17 20:15:20 -0500
commit93d78394ac5ec72315e7f9a7193c6649d817a9eb (patch)
tree9cf75d439eccc97afeee4cb4e6192e14b41d408f
parentbdaa2c63b060ae082ab4f20378c1a6307b59b8db (diff)
rtc: rtc-spear: Add clk_{un}prepare() support
clk_{un}prepare is mandatory for platforms using common clock framework. Because for SPEAr we don't do anything in clk_{un}prepare() calls, just call them once in probe/remove. Signed-off-by: Deepak Sikri <deepak.sikri@st.com> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Cc: Alessandro Zummo <a.zummo@towertech.it> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/rtc/rtc-spear.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/rtc/rtc-spear.c b/drivers/rtc/rtc-spear.c
index 311a5274b528..c96f56cfc1d8 100644
--- a/drivers/rtc/rtc-spear.c
+++ b/drivers/rtc/rtc-spear.c
@@ -395,7 +395,7 @@ static int __devinit spear_rtc_probe(struct platform_device *pdev)
395 if (IS_ERR(config->clk)) 395 if (IS_ERR(config->clk))
396 return PTR_ERR(config->clk); 396 return PTR_ERR(config->clk);
397 397
398 status = clk_enable(config->clk); 398 status = clk_prepare_enable(config->clk);
399 if (status < 0) 399 if (status < 0)
400 return status; 400 return status;
401 401
@@ -418,7 +418,7 @@ static int __devinit spear_rtc_probe(struct platform_device *pdev)
418 418
419err_disable_clock: 419err_disable_clock:
420 platform_set_drvdata(pdev, NULL); 420 platform_set_drvdata(pdev, NULL);
421 clk_disable(config->clk); 421 clk_disable_unprepare(config->clk);
422 422
423 return status; 423 return status;
424} 424}
@@ -429,7 +429,7 @@ static int __devexit spear_rtc_remove(struct platform_device *pdev)
429 429
430 rtc_device_unregister(config->rtc); 430 rtc_device_unregister(config->rtc);
431 spear_rtc_disable_interrupt(config); 431 spear_rtc_disable_interrupt(config);
432 clk_disable(config->clk); 432 clk_disable_unprepare(config->clk);
433 device_init_wakeup(&pdev->dev, 0); 433 device_init_wakeup(&pdev->dev, 0);
434 434
435 return 0; 435 return 0;