summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2013-12-09 10:40:22 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-12-09 20:25:20 +0000
commit5303c0f46c8708fff4148ebcc491f78710356952 (patch)
tree1f0985780bba393615053c6dcc80cebdf7de1bb5
parent89a5c985f81a0b60f7522044938f76caf28075a6 (diff)
downloadblackbird-obmc-linux-5303c0f46c8708fff4148ebcc491f78710356952.tar.gz
blackbird-obmc-linux-5303c0f46c8708fff4148ebcc491f78710356952.zip
ARM: 7916/1: amba: Add clk_prepare|unprepare in runtime PM callbacks
To fully gate the clock and thus potentially also save more power in runtime suspend state, extend clock handling with clk_prepare|unprepare in the runtime PM callbacks. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--drivers/amba/bus.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index ea1d8357f298..9e6029105607 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -95,7 +95,7 @@ static int amba_pm_runtime_suspend(struct device *dev)
int ret = pm_generic_runtime_suspend(dev);
if (ret == 0 && dev->driver)
- clk_disable(pcdev->pclk);
+ clk_disable_unprepare(pcdev->pclk);
return ret;
}
@@ -106,7 +106,7 @@ static int amba_pm_runtime_resume(struct device *dev)
int ret;
if (dev->driver) {
- ret = clk_enable(pcdev->pclk);
+ ret = clk_prepare_enable(pcdev->pclk);
/* Failure is probably fatal to the system, but... */
if (ret)
return ret;
OpenPOWER on IntegriCloud