summaryrefslogtreecommitdiffstats
path: root/drivers/pwm
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-06-26 16:58:09 +0800
committerThierry Reding <thierry.reding@avionic-design.de>2012-07-23 13:23:54 +0200
commit01bf32e94968fd13804062859cfd935efebc11e9 (patch)
tree542a8362ce3c07764a4749f3a1f661cee35521be /drivers/pwm
parent071407eefd708d7e273b67af150f8dff6c51eb58 (diff)
downloadop-kernel-dev-01bf32e94968fd13804062859cfd935efebc11e9.zip
op-kernel-dev-01bf32e94968fd13804062859cfd935efebc11e9.tar.gz
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/pwm')
-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 39bdebc..5227415 100644
--- 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 d9a3805..23e524b 100644
--- 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;
OpenPOWER on IntegriCloud