From: shawn.guo@linaro.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 01/13] rtc: stmp3xxx: use stmp_reset_block() instead
Date: Fri, 29 Mar 2013 16:55:37 +0800 [thread overview]
Message-ID: <1364547350-30498-2-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1364547350-30498-1-git-send-email-shawn.guo@linaro.org>
The function stmp_reset_block() provides the exactly same functionality
as mxs_reset_block(). So use stmp_reset_block() instead, so that
<mach/common.h> inclusion can be removed.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: rtc-linux at googlegroups.com
---
drivers/rtc/rtc-stmp3xxx.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/rtc/rtc-stmp3xxx.c b/drivers/rtc/rtc-stmp3xxx.c
index 98f0d3c..67d2612 100644
--- a/drivers/rtc/rtc-stmp3xxx.c
+++ b/drivers/rtc/rtc-stmp3xxx.c
@@ -30,8 +30,6 @@
#include <linux/stmp_device.h>
#include <linux/stmp3xxx_rtc_wdt.h>
-#include <mach/common.h>
-
#define STMP3XXX_RTC_CTRL 0x0
#define STMP3XXX_RTC_CTRL_SET 0x4
#define STMP3XXX_RTC_CTRL_CLR 0x8
@@ -271,7 +269,7 @@ static int stmp3xxx_rtc_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, rtc_data);
- mxs_reset_block(rtc_data->io);
+ stmp_reset_block(rtc_data->io);
writel(STMP3XXX_RTC_PERSISTENT0_ALARM_EN |
STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE_EN |
STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE,
@@ -319,7 +317,7 @@ static int stmp3xxx_rtc_resume(struct platform_device *dev)
{
struct stmp3xxx_rtc_data *rtc_data = platform_get_drvdata(dev);
- mxs_reset_block(rtc_data->io);
+ stmp_reset_block(rtc_data->io);
writel(STMP3XXX_RTC_PERSISTENT0_ALARM_EN |
STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE_EN |
STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE,
--
1.7.9.5
next prev parent reply other threads:[~2013-03-29 8:55 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-29 8:55 [PATCH 00/13] mach-mxs header files cleanup Shawn Guo
2013-03-29 8:55 ` Shawn Guo [this message]
2013-03-29 8:55 ` [PATCH 02/13] iio: mxs-lradc: remove unneeded mach header inclusion Shawn Guo
2013-03-29 9:28 ` Jonathan Cameron
2013-03-29 8:55 ` [PATCH 03/13] ASoC: mxs-saif: remove " Shawn Guo
2013-04-01 11:45 ` Mark Brown
2013-03-29 8:55 ` [PATCH 04/13] ARM: mxs: remove empty hardware.h Shawn Guo
2013-03-29 8:55 ` [PATCH 05/13] ARM: mxs: get reset address from device tree Shawn Guo
2013-03-29 8:55 ` [PATCH 06/13] ARM: mxs: remove system.c Shawn Guo
2013-03-29 8:55 ` [PATCH 07/13] ARM: mxs: get ocotp base address from device tree Shawn Guo
2013-03-29 8:55 ` [PATCH 08/13] ARM: mxs: use debug_ll_io_init for low-level debug Shawn Guo
2013-03-29 8:55 ` [PATCH 09/13] ARM: mxs: remove mm.c Shawn Guo
2013-03-29 8:55 ` [PATCH 10/13] ARM: mxs: move mxs_get_ocotp() into mach-mxs.c Shawn Guo
2013-03-29 8:55 ` [PATCH 11/13] ARM: mxs: remove common.h Shawn Guo
2013-03-29 8:55 ` [PATCH 12/13] ARM: mxs: merge imx23 and imx28 into one machine_desc Shawn Guo
2013-03-29 8:55 ` [PATCH 13/13] ARM: mxs: remove unused headers 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=1364547350-30498-2-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).