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>

diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index ea1d835..9e60291 100644 (file)
--- 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;