aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pwm/pwm-imx.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pwm/pwm-imx.c')
-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 0f6c436c0632..852de6ce6e11 100644
--- a/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@ -17,7 +17,6 @@
17#include <linux/io.h> 17#include <linux/io.h>
18#include <linux/pwm.h> 18#include <linux/pwm.h>
19#include <linux/of_device.h> 19#include <linux/of_device.h>
20#include <mach/hardware.h>
21 20
22/* i.MX1 and i.MX21 share the same PWM function block: */ 21/* i.MX1 and i.MX21 share the same PWM function block: */
23 22
@@ -133,16 +132,11 @@ static int imx_pwm_config_v2(struct pwm_chip *chip,
133 132
134 cr = MX3_PWMCR_PRESCALER(prescale) | 133 cr = MX3_PWMCR_PRESCALER(prescale) |
135 MX3_PWMCR_DOZEEN | MX3_PWMCR_WAITEN | 134 MX3_PWMCR_DOZEEN | MX3_PWMCR_WAITEN |
136 MX3_PWMCR_DBGEN; 135 MX3_PWMCR_DBGEN | MX3_PWMCR_CLKSRC_IPG_HIGH;
137 136
138 if (imx->enabled) 137 if (imx->enabled)
139 cr |= MX3_PWMCR_EN; 138 cr |= MX3_PWMCR_EN;
140 139
141 if (cpu_is_mx25())
142 cr |= MX3_PWMCR_CLKSRC_IPG;
143 else
144 cr |= MX3_PWMCR_CLKSRC_IPG_HIGH;
145
146 writel(cr, imx->mmio_base + MX3_PWMCR); 140 writel(cr, imx->mmio_base + MX3_PWMCR);
147 141
148 return 0; 142 return 0;