Merge branch 'common/intc-extension' into sh-latest

[~andy/linux] / arch / arm / plat-mxc / pwm.c

diff --git a/arch/arm/plat-mxc/pwm.c b/arch/arm/plat-mxc/pwm.c
index e032717f7d02c211ee8cad0d0200cec5f83974cf..c0cab2270dd171f64b713fb5b3a1700fb298900c 100644 (file)
--- a/arch/arm/plat-mxc/pwm.c
+++ b/arch/arm/plat-mxc/pwm.c
@@ -132,7 +132,7 @@ int pwm_enable(struct pwm_device *pwm)
        int rc = 0;
 
        if (!pwm->clk_enabled) {
-               rc = clk_enable(pwm->clk);
+               rc = clk_prepare_enable(pwm->clk);
                if (!rc)
                        pwm->clk_enabled = 1;
        }
@@ -145,7 +145,7 @@ void pwm_disable(struct pwm_device *pwm)
        writel(0, pwm->mmio_base + MX3_PWMCR);
 
        if (pwm->clk_enabled) {
-               clk_disable(pwm->clk);
+               clk_disable_unprepare(pwm->clk);
                pwm->clk_enabled = 0;
        }
 }