summaryrefslogtreecommitdiffstats
path: root/drivers/pwm
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-08-28 12:03:29 +0200
committerThierry Reding <thierry.reding@avionic-design.de>2012-09-12 14:25:06 +0200
commit8d1c24bfd20829f5943c76b85c4973db264dd666 (patch)
tree1f2b14fe60d88e63dd8919683213014f64d52641 /drivers/pwm
parent479e2e301c626cc64fb27b6b1938655eaba8b036 (diff)
downloadop-kernel-dev-8d1c24bfd20829f5943c76b85c4973db264dd666.zip
op-kernel-dev-8d1c24bfd20829f5943c76b85c4973db264dd666.tar.gz
pwm: i.MX: use per clock unconditionally
The i.MX PWM module has two clocks: The ipg clock and the ipg highfreq (peripheral) clock. The ipg clock has to be enabled for this hardware to work. The actual PWM output can either be driven by the ipg clock or the ipg highfreq. The ipg highfreq has the advantage that it runs even when the SoC is in low power modes. Use the always running clock also on i.MX25. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Reviewed-by: Shawn Guo <shawn.guo@linaro.org> Reviewed-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Diffstat (limited to 'drivers/pwm')
-rw-r--r--drivers/pwm/pwm-imx.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c
index 0f6c436..852de6c 100644
--- a/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@ -17,7 +17,6 @@
#include <linux/io.h>
#include <linux/pwm.h>
#include <linux/of_device.h>
-#include <mach/hardware.h>
/* i.MX1 and i.MX21 share the same PWM function block: */
@@ -133,16 +132,11 @@ static int imx_pwm_config_v2(struct pwm_chip *chip,
cr = MX3_PWMCR_PRESCALER(prescale) |
MX3_PWMCR_DOZEEN | MX3_PWMCR_WAITEN |
- MX3_PWMCR_DBGEN;
+ MX3_PWMCR_DBGEN | MX3_PWMCR_CLKSRC_IPG_HIGH;
if (imx->enabled)
cr |= MX3_PWMCR_EN;
- if (cpu_is_mx25())
- cr |= MX3_PWMCR_CLKSRC_IPG;
- else
- cr |= MX3_PWMCR_CLKSRC_IPG_HIGH;
-
writel(cr, imx->mmio_base + MX3_PWMCR);
return 0;
OpenPOWER on IntegriCloud