diff options
author | Ulf Hansson <ulf.hansson@linaro.org> | 2013-12-09 04:40:22 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-12-09 15:25:20 -0500 |
commit | 5303c0f46c8708fff4148ebcc491f78710356952 (patch) | |
tree | 1f0985780bba393615053c6dcc80cebdf7de1bb5 /drivers/amba | |
parent | 89a5c985f81a0b60f7522044938f76caf28075a6 (diff) |
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>
Diffstat (limited to 'drivers/amba')
-rw-r--r-- | drivers/amba/bus.c | 4 |
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) | |||
95 | int ret = pm_generic_runtime_suspend(dev); | 95 | int ret = pm_generic_runtime_suspend(dev); |
96 | 96 | ||
97 | if (ret == 0 && dev->driver) | 97 | if (ret == 0 && dev->driver) |
98 | clk_disable(pcdev->pclk); | 98 | clk_disable_unprepare(pcdev->pclk); |
99 | 99 | ||
100 | return ret; | 100 | return ret; |
101 | } | 101 | } |
@@ -106,7 +106,7 @@ static int amba_pm_runtime_resume(struct device *dev) | |||
106 | int ret; | 106 | int ret; |
107 | 107 | ||
108 | if (dev->driver) { | 108 | if (dev->driver) { |
109 | ret = clk_enable(pcdev->pclk); | 109 | ret = clk_prepare_enable(pcdev->pclk); |
110 | /* Failure is probably fatal to the system, but... */ | 110 | /* Failure is probably fatal to the system, but... */ |
111 | if (ret) | 111 | if (ret) |
112 | return ret; | 112 | return ret; |