aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-06-26 04:58:09 -0400
committerThierry Reding <thierry.reding@avionic-design.de>2012-07-23 07:23:54 -0400
commit01bf32e94968fd13804062859cfd935efebc11e9 (patch)
tree542a8362ce3c07764a4749f3a1f661cee35521be /drivers
parent071407eefd708d7e273b67af150f8dff6c51eb58 (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pwm/Kconfig1
-rw-r--r--drivers/pwm/pwm-mxs.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index 39bdebc0cb2..5227415f185 100644
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -30,6 +30,7 @@ config PWM_IMX
30config PWM_MXS 30config PWM_MXS
31 tristate "Freescale MXS PWM support" 31 tristate "Freescale MXS PWM support"
32 depends on ARCH_MXS && OF 32 depends on ARCH_MXS && OF
33 select STMP_DEVICE
33 help 34 help
34 Generic PWM framework driver for Freescale MXS. 35 Generic PWM framework driver for Freescale MXS.
35 36
diff --git a/drivers/pwm/pwm-mxs.c b/drivers/pwm/pwm-mxs.c
index d9a38050a50..23e524bbee0 100644
--- a/drivers/pwm/pwm-mxs.c
+++ b/drivers/pwm/pwm-mxs.c
@@ -19,7 +19,7 @@
19#include <linux/platform_device.h> 19#include <linux/platform_device.h>
20#include <linux/pwm.h> 20#include <linux/pwm.h>
21#include <linux/slab.h> 21#include <linux/slab.h>
22#include <mach/common.h> 22#include <linux/stmp_device.h>
23 23
24#define SET 0x4 24#define SET 0x4
25#define CLR 0x8 25#define CLR 0x8
@@ -163,7 +163,7 @@ static int mxs_pwm_probe(struct platform_device *pdev)
163 mxs->dev = &pdev->dev; 163 mxs->dev = &pdev->dev;
164 platform_set_drvdata(pdev, mxs); 164 platform_set_drvdata(pdev, mxs);
165 165
166 mxs_reset_block(mxs->base); 166 stmp_reset_block(mxs->base);
167 167
168 return 0; 168 return 0;
169 169