From: shawn.guo@linaro.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 2/4] pwm: pwm-mxs: use global reset function stmp_reset_block
Date: Wed, 27 Jun 2012 21:36:05 +0800 [thread overview]
Message-ID: <1340804165-29331-1-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1340701091-8488-3-git-send-email-shawn.guo@linaro.org>
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>
---
Changes since v1:
* Select STMP_DEVICE for PWM_MXS Kconfig option
drivers/pwm/Kconfig | 1 +
drivers/pwm/pwm-mxs.c | 4 ++--
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 7af3a6a..7a97997 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;
--
1.7.5.4
next prev parent reply other threads:[~2012-06-27 13:36 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-26 8:58 [PATCH 0/4] pwm-mxs driver updates Shawn Guo
2012-06-26 8:58 ` [PATCH 1/4] pwm: pwm-mxs: encode soc name in compatible string Shawn Guo
2012-06-26 8:58 ` [PATCH 2/4] pwm: pwm-mxs: use global reset function stmp_reset_block Shawn Guo
2012-06-26 9:54 ` Thierry Reding
2012-06-26 9:57 ` Thierry Reding
2012-06-26 11:14 ` Shawn Guo
2012-06-27 13:36 ` Shawn Guo [this message]
2012-06-27 13:39 ` [PATCH v2 " Thierry Reding
2012-06-26 8:58 ` [PATCH 3/4] pwm: pwm-mxs: use devm_* managed functions Shawn Guo
2012-06-26 8:58 ` [PATCH 4/4] pwm: pwm-mxs: add pinctrl support Shawn Guo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1340804165-29331-1-git-send-email-shawn.guo@linaro.org \
--to=shawn.guo@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).