From dcfff78850ac87767c1d68ead70d272a4fcc5916 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Fri, 19 Jun 2009 11:35:08 +0200 Subject: [PATCH] --- yaml --- r: 160862 b: refs/heads/master c: 5ef881bbecc72862fa379cb286a50f2781db4cec h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-mxc/pwm.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a63c276a2ef1..e244f8986dc3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 494f22dddc6308b9c35984118ff4cb1681ad8e48 +refs/heads/master: 5ef881bbecc72862fa379cb286a50f2781db4cec diff --git a/trunk/arch/arm/plat-mxc/pwm.c b/trunk/arch/arm/plat-mxc/pwm.c index ae34198a79dd..42dd17b89ff3 100644 --- a/trunk/arch/arm/plat-mxc/pwm.c +++ b/trunk/arch/arm/plat-mxc/pwm.c @@ -72,7 +72,7 @@ int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns) writel(duty_cycles, pwm->mmio_base + MX3_PWMSAR); writel(period_cycles, pwm->mmio_base + MX3_PWMPR); - writel(MX3_PWMCR_PRESCALER(prescale - 1) | + writel(MX3_PWMCR_PRESCALER(prescale) | MX3_PWMCR_CLKSRC_IPG_HIGH | MX3_PWMCR_EN, pwm->mmio_base + MX3_PWMCR); } else if (cpu_is_mx1() || cpu_is_mx21()) { @@ -118,6 +118,8 @@ EXPORT_SYMBOL(pwm_enable); void pwm_disable(struct pwm_device *pwm) { + writel(0, pwm->mmio_base + MX3_PWMCR); + if (pwm->clk_enabled) { clk_disable(pwm->clk); pwm->clk_enabled = 0;