pwm: pwm-mxs: use global reset function stmp_reset_block

Use global reset function stmp_reset_block instead of mxs_reset_block
to remove <mach/common.h> inclusion.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>

diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index 39bdebc0cb20d4bd4aaeac197939c955fb5325a2..5227415f18554addbe36892a2b13595608df8ced 100644 (file)
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -30,6 +30,7 @@ config PWM_IMX
 config PWM_MXS
        tristate "Freescale MXS PWM support"
        depends on ARCH_MXS && OF
+       select STMP_DEVICE
        help
          Generic PWM framework driver for Freescale MXS.
 

diff --git a/drivers/pwm/pwm-mxs.c b/drivers/pwm/pwm-mxs.c
index d9a38050a50238b1812620c770e368f3d46b2a08..23e524bbee0378671cd3ff6044f093d26c347fda 100644 (file)
--- a/drivers/pwm/pwm-mxs.c
+++ b/drivers/pwm/pwm-mxs.c
@@ -19,7 +19,7 @@
 #include <linux/platform_device.h>
 #include <linux/pwm.h>
 #include <linux/slab.h>
-#include <mach/common.h>
+#include <linux/stmp_device.h>
 
 #define SET    0x4
 #define CLR    0x8
@@ -163,7 +163,7 @@ static int mxs_pwm_probe(struct platform_device *pdev)
        mxs->dev = &pdev->dev;
        platform_set_drvdata(pdev, mxs);
 
-       mxs_reset_block(mxs->base);
+       stmp_reset_block(mxs->base);
 
        return 0;