From a02475b9a715b5fdaa2cf0acbfa3cf91d5db8cea Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Tue, 28 Aug 2012 12:03:29 +0200
Subject: [PATCH] --- yaml --- r: 333096 b: refs/heads/master c:
 8d1c24bfd20829f5943c76b85c4973db264dd666 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/pwm/pwm-imx.c | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 5292046730e1..472f23701364 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 479e2e301c626cc64fb27b6b1938655eaba8b036
+refs/heads/master: 8d1c24bfd20829f5943c76b85c4973db264dd666
diff --git a/trunk/drivers/pwm/pwm-imx.c b/trunk/drivers/pwm/pwm-imx.c
index 0f6c436c0632..852de6ce6e11 100644
--- a/trunk/drivers/pwm/pwm-imx.c
+++ b/trunk/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;