summaryrefslogtreecommitdiffstats
path: root/drivers/rtc
diff options
context:
space:
mode:
authorDeepak Sikri <deepak.sikri@st.com>2012-12-17 16:02:32 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-17 17:15:20 -0800
commit93d78394ac5ec72315e7f9a7193c6649d817a9eb (patch)
tree9cf75d439eccc97afeee4cb4e6192e14b41d408f /drivers/rtc
parentbdaa2c63b060ae082ab4f20378c1a6307b59b8db (diff)
downloadop-kernel-dev-93d78394ac5ec72315e7f9a7193c6649d817a9eb.zip
op-kernel-dev-93d78394ac5ec72315e7f9a7193c6649d817a9eb.tar.gz
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>
Diffstat (limited to 'drivers/rtc')
-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 311a527..c96f56c 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)
if (IS_ERR(config->clk))
return PTR_ERR(config->clk);
- status = clk_enable(config->clk);
+ status = clk_prepare_enable(config->clk);
if (status < 0)
return status;
@@ -418,7 +418,7 @@ static int __devinit spear_rtc_probe(struct platform_device *pdev)
err_disable_clock:
platform_set_drvdata(pdev, NULL);
- clk_disable(config->clk);
+ clk_disable_unprepare(config->clk);
return status;
}
@@ -429,7 +429,7 @@ static int __devexit spear_rtc_remove(struct platform_device *pdev)
rtc_device_unregister(config->rtc);
spear_rtc_disable_interrupt(config);
- clk_disable(config->clk);
+ clk_disable_unprepare(config->clk);
device_init_wakeup(&pdev->dev, 0);
return 0;
OpenPOWER on IntegriCloud