diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2013-03-28 11:13:14 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2013-04-01 04:30:05 -0400 |
commit | 36d1da1d15743e8d25e2699a2edb19d7c492bec8 (patch) | |
tree | b5be71b201995696cba7e14febc29bf9c756bd66 /drivers/rtc | |
parent | 0c672aae287ef0b9a12a1ca67c1ad7a4bbe470ac (diff) |
rtc: stmp3xxx: use stmp_reset_block() instead
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@googlegroups.com
Diffstat (limited to 'drivers/rtc')
-rw-r--r-- | drivers/rtc/rtc-stmp3xxx.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/rtc/rtc-stmp3xxx.c b/drivers/rtc/rtc-stmp3xxx.c index 98f0d3c30738..67d26128bc85 100644 --- a/drivers/rtc/rtc-stmp3xxx.c +++ b/drivers/rtc/rtc-stmp3xxx.c | |||
@@ -30,8 +30,6 @@ | |||
30 | #include <linux/stmp_device.h> | 30 | #include <linux/stmp_device.h> |
31 | #include <linux/stmp3xxx_rtc_wdt.h> | 31 | #include <linux/stmp3xxx_rtc_wdt.h> |
32 | 32 | ||
33 | #include <mach/common.h> | ||
34 | |||
35 | #define STMP3XXX_RTC_CTRL 0x0 | 33 | #define STMP3XXX_RTC_CTRL 0x0 |
36 | #define STMP3XXX_RTC_CTRL_SET 0x4 | 34 | #define STMP3XXX_RTC_CTRL_SET 0x4 |
37 | #define STMP3XXX_RTC_CTRL_CLR 0x8 | 35 | #define STMP3XXX_RTC_CTRL_CLR 0x8 |
@@ -271,7 +269,7 @@ static int stmp3xxx_rtc_probe(struct platform_device *pdev) | |||
271 | 269 | ||
272 | platform_set_drvdata(pdev, rtc_data); | 270 | platform_set_drvdata(pdev, rtc_data); |
273 | 271 | ||
274 | mxs_reset_block(rtc_data->io); | 272 | stmp_reset_block(rtc_data->io); |
275 | writel(STMP3XXX_RTC_PERSISTENT0_ALARM_EN | | 273 | writel(STMP3XXX_RTC_PERSISTENT0_ALARM_EN | |
276 | STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE_EN | | 274 | STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE_EN | |
277 | STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE, | 275 | STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE, |
@@ -319,7 +317,7 @@ static int stmp3xxx_rtc_resume(struct platform_device *dev) | |||
319 | { | 317 | { |
320 | struct stmp3xxx_rtc_data *rtc_data = platform_get_drvdata(dev); | 318 | struct stmp3xxx_rtc_data *rtc_data = platform_get_drvdata(dev); |
321 | 319 | ||
322 | mxs_reset_block(rtc_data->io); | 320 | stmp_reset_block(rtc_data->io); |
323 | writel(STMP3XXX_RTC_PERSISTENT0_ALARM_EN | | 321 | writel(STMP3XXX_RTC_PERSISTENT0_ALARM_EN | |
324 | STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE_EN | | 322 | STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE_EN | |
325 | STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE, | 323 | STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE, |