Skip to content

L
linux
Commit 47eac337 authored by Wolfram Sang's avatar Wolfram Sang Committed by John Stultz
Browse files
Options

rtc: stmp3xxx: Restore register definitions 

The stmp3xxx driver used to include register names from a stmp-specific
include. Because of consolidation, plat-stmp has now been removed and
merged with the compatible mach-mxs. Restore the register names directly
in the driver and rename them to be specific to this driver.
Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Tested-by: default avatarShawn Guo <shawn.guo@freescale.com>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent 07187ee1
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 37 deletions
drivers/rtc/rtc-stmp3xxx.c
View file @ 47eac337
...@@ -26,7 +26,25 @@ ...@@ -26,7 +26,25 @@
#include <mach/platform.h> #include <mach/platform.h>
#include <mach/stmp3xxx.h> #include <mach/stmp3xxx.h>
#include <mach/regs-rtc.h>
#define STMP3XXX_RTC_CTRL 0x0
#define STMP3XXX_RTC_CTRL_ALARM_IRQ_EN 0x00000001
#define STMP3XXX_RTC_CTRL_ONEMSEC_IRQ_EN 0x00000002
#define STMP3XXX_RTC_CTRL_ALARM_IRQ 0x00000004
#define STMP3XXX_RTC_CTRL_ONEMSEC_IRQ 0x00000008
#define STMP3XXX_RTC_STAT 0x10
#define STMP3XXX_RTC_STAT_STALE_SHIFT 16
#define STMP3XXX_RTC_STAT_RTC_PRESENT 0x80000000
#define STMP3XXX_RTC_SECONDS 0x30
#define STMP3XXX_RTC_ALARM 0x40
#define STMP3XXX_RTC_PERSISTENT0 0x60
#define STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE_EN 0x00000002
#define STMP3XXX_RTC_PERSISTENT0_ALARM_EN 0x00000004
#define STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE 0x00000080
struct stmp3xxx_rtc_data { struct stmp3xxx_rtc_data {
struct rtc_device *rtc; struct rtc_device *rtc;
...@@ -42,8 +60,8 @@ static void stmp3xxx_wait_time(struct stmp3xxx_rtc_data *rtc_data) ...@@ -42,8 +60,8 @@ static void stmp3xxx_wait_time(struct stmp3xxx_rtc_data *rtc_data)
* NEW_REGS/STALE_REGS bitfields go. In fact it's 0x1=P0, * NEW_REGS/STALE_REGS bitfields go. In fact it's 0x1=P0,
* 0x2=P1, .., 0x20=P5, 0x40=ALARM, 0x80=SECONDS * 0x2=P1, .., 0x20=P5, 0x40=ALARM, 0x80=SECONDS
*/ */
while (__raw_readl(rtc_data->io + HW_RTC_STAT) & while (__raw_readl(rtc_data->io + STMP3XXX_RTC_STAT) &
BF(0x80, RTC_STAT_STALE_REGS)) (0x80 << STMP3XXX_RTC_STAT_STALE_SHIFT))
cpu_relax(); cpu_relax();
} }
...@@ -53,7 +71,8 @@ static int stmp3xxx_rtc_gettime(struct device *dev, struct rtc_time *rtc_tm) ...@@ -53,7 +71,8 @@ static int stmp3xxx_rtc_gettime(struct device *dev, struct rtc_time *rtc_tm)
struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev); struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev);
stmp3xxx_wait_time(rtc_data); stmp3xxx_wait_time(rtc_data);
rtc_time_to_tm(__raw_readl(rtc_data->io + HW_RTC_SECONDS), rtc_tm); rtc_time_to_tm(__raw_readl(rtc_data->io + STMP3XXX_RTC_SECONDS),
rtc_tm);
return 0; return 0;
} }
...@@ -61,7 +80,7 @@ static int stmp3xxx_rtc_set_mmss(struct device *dev, unsigned long t) ...@@ -61,7 +80,7 @@ static int stmp3xxx_rtc_set_mmss(struct device *dev, unsigned long t)
{ {
struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev); struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev);
__raw_writel(t, rtc_data->io + HW_RTC_SECONDS); __raw_writel(t, rtc_data->io + STMP3XXX_RTC_SECONDS);
stmp3xxx_wait_time(rtc_data); stmp3xxx_wait_time(rtc_data);
return 0; return 0;
} }
...@@ -73,18 +92,19 @@ static irqreturn_t stmp3xxx_rtc_interrupt(int irq, void *dev_id) ...@@ -73,18 +92,19 @@ static irqreturn_t stmp3xxx_rtc_interrupt(int irq, void *dev_id)
u32 status; u32 status;
u32 events = 0; u32 events = 0;
status = __raw_readl(rtc_data->io + HW_RTC_CTRL) & status = __raw_readl(rtc_data->io + STMP3XXX_RTC_CTRL) &
(BM_RTC_CTRL_ALARM_IRQ | BM_RTC_CTRL_ONEMSEC_IRQ); (STMP3XXX_RTC_CTRL_ALARM_IRQ |
STMP3XXX_RTC_CTRL_ONEMSEC_IRQ);
if (status & BM_RTC_CTRL_ALARM_IRQ) { if (status & STMP3XXX_RTC_CTRL_ALARM_IRQ) {
stmp3xxx_clearl(BM_RTC_CTRL_ALARM_IRQ, stmp3xxx_clearl(STMP3XXX_RTC_CTRL_ALARM_IRQ,
rtc_data->io + HW_RTC_CTRL); rtc_data->io + STMP3XXX_RTC_CTRL);
events |= RTC_AF | RTC_IRQF; events |= RTC_AF | RTC_IRQF;
} }
if (status & BM_RTC_CTRL_ONEMSEC_IRQ) { if (status & STMP3XXX_RTC_CTRL_ONEMSEC_IRQ) {
stmp3xxx_clearl(BM_RTC_CTRL_ONEMSEC_IRQ, stmp3xxx_clearl(STMP3XXX_RTC_CTRL_ONEMSEC_IRQ,
rtc_data->io + HW_RTC_CTRL); rtc_data->io + STMP3XXX_RTC_CTRL);
if (++rtc_data->irq_count % 1000 == 0) { if (++rtc_data->irq_count % 1000 == 0) {
events |= RTC_UF | RTC_IRQF; events |= RTC_UF | RTC_IRQF;
rtc_data->irq_count = 0; rtc_data->irq_count = 0;
...@@ -100,17 +120,17 @@ static irqreturn_t stmp3xxx_rtc_interrupt(int irq, void *dev_id) ...@@ -100,17 +120,17 @@ static irqreturn_t stmp3xxx_rtc_interrupt(int irq, void *dev_id)
static int stmp3xxx_alarm_irq_enable(struct device *dev, unsigned int enabled) static int stmp3xxx_alarm_irq_enable(struct device *dev, unsigned int enabled)
{ {
struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev); struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev);
void __iomem *p = rtc_data->io + HW_RTC_PERSISTENT0, void __iomem *p = rtc_data->io + STMP3XXX_RTC_PERSISTENT0,
*ctl = rtc_data->io + HW_RTC_CTRL; *ctl = rtc_data->io + STMP3XXX_RTC_CTRL;
if (enabled) { if (enabled) {
stmp3xxx_setl(BM_RTC_PERSISTENT0_ALARM_EN | stmp3xxx_setl(STMP3XXX_RTC_PERSISTENT0_ALARM_EN |
BM_RTC_PERSISTENT0_ALARM_WAKE_EN, p); STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE_EN, p);
stmp3xxx_setl(BM_RTC_CTRL_ALARM_IRQ_EN, ctl); stmp3xxx_setl(STMP3XXX_RTC_CTRL_ALARM_IRQ_EN, ctl);
} else { } else {
stmp3xxx_clearl(BM_RTC_PERSISTENT0_ALARM_EN | stmp3xxx_clearl(STMP3XXX_RTC_PERSISTENT0_ALARM_EN |
BM_RTC_PERSISTENT0_ALARM_WAKE_EN, p); STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE_EN, p);
stmp3xxx_clearl(BM_RTC_CTRL_ALARM_IRQ_EN, ctl); stmp3xxx_clearl(STMP3XXX_RTC_CTRL_ALARM_IRQ_EN, ctl);
} }
return 0; return 0;
} }
...@@ -119,7 +139,8 @@ static int stmp3xxx_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm) ...@@ -119,7 +139,8 @@ static int stmp3xxx_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm)
{ {
struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev); struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev);
rtc_time_to_tm(__raw_readl(rtc_data->io + HW_RTC_ALARM), &alm->time); rtc_time_to_tm(__raw_readl(rtc_data->io + STMP3XXX_RTC_ALARM),
&alm->time);
return 0; return 0;
} }
...@@ -129,7 +150,7 @@ static int stmp3xxx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm) ...@@ -129,7 +150,7 @@ static int stmp3xxx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev); struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev);
rtc_tm_to_time(&alm->time, &t); rtc_tm_to_time(&alm->time, &t);
__raw_writel(t, rtc_data->io + HW_RTC_ALARM); __raw_writel(t, rtc_data->io + STMP3XXX_RTC_ALARM);
return 0; return 0;
} }
...@@ -149,8 +170,9 @@ static int stmp3xxx_rtc_remove(struct platform_device *pdev) ...@@ -149,8 +170,9 @@ static int stmp3xxx_rtc_remove(struct platform_device *pdev)
if (!rtc_data) if (!rtc_data)
return 0; return 0;
stmp3xxx_clearl(BM_RTC_CTRL_ONEMSEC_IRQ_EN | BM_RTC_CTRL_ALARM_IRQ_EN, stmp3xxx_clearl(STMP3XXX_RTC_CTRL_ONEMSEC_IRQ_EN |
rtc_data->io + HW_RTC_CTRL); STMP3XXX_RTC_CTRL_ALARM_IRQ_EN,
rtc_data->io + STMP3XXX_RTC_CTRL);
free_irq(rtc_data->irq_alarm, &pdev->dev); free_irq(rtc_data->irq_alarm, &pdev->dev);
free_irq(rtc_data->irq_1msec, &pdev->dev); free_irq(rtc_data->irq_1msec, &pdev->dev);
rtc_device_unregister(rtc_data->rtc); rtc_device_unregister(rtc_data->rtc);
...@@ -187,18 +209,18 @@ static int stmp3xxx_rtc_probe(struct platform_device *pdev) ...@@ -187,18 +209,18 @@ static int stmp3xxx_rtc_probe(struct platform_device *pdev)
rtc_data->irq_alarm = platform_get_irq(pdev, 0); rtc_data->irq_alarm = platform_get_irq(pdev, 0);
rtc_data->irq_1msec = platform_get_irq(pdev, 1); rtc_data->irq_1msec = platform_get_irq(pdev, 1);
if (!(__raw_readl(HW_RTC_STAT + rtc_data->io) & if (!(__raw_readl(STMP3XXX_RTC_STAT + rtc_data->io) &
BM_RTC_STAT_RTC_PRESENT)) { STMP3XXX_RTC_STAT_RTC_PRESENT)) {
dev_err(&pdev->dev, "no device onboard\n"); dev_err(&pdev->dev, "no device onboard\n");
err = -ENODEV; err = -ENODEV;
goto out_remap; goto out_remap;
} }
stmp3xxx_reset_block(rtc_data->io, true); stmp3xxx_reset_block(rtc_data->io, true);
stmp3xxx_clearl(BM_RTC_PERSISTENT0_ALARM_EN | stmp3xxx_clearl(STMP3XXX_RTC_PERSISTENT0_ALARM_EN |
BM_RTC_PERSISTENT0_ALARM_WAKE_EN | STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE_EN |
BM_RTC_PERSISTENT0_ALARM_WAKE, STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE,
rtc_data->io + HW_RTC_PERSISTENT0); rtc_data->io + STMP3XXX_RTC_PERSISTENT0);
rtc_data->rtc = rtc_device_register(pdev->name, &pdev->dev, rtc_data->rtc = rtc_device_register(pdev->name, &pdev->dev,
&stmp3xxx_rtc_ops, THIS_MODULE); &stmp3xxx_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc_data->rtc)) { if (IS_ERR(rtc_data->rtc)) {
...@@ -229,8 +251,9 @@ static int stmp3xxx_rtc_probe(struct platform_device *pdev) ...@@ -229,8 +251,9 @@ static int stmp3xxx_rtc_probe(struct platform_device *pdev)
out_irq1: out_irq1:
free_irq(rtc_data->irq_alarm, &pdev->dev); free_irq(rtc_data->irq_alarm, &pdev->dev);
out_irq_alarm: out_irq_alarm:
stmp3xxx_clearl(BM_RTC_CTRL_ONEMSEC_IRQ_EN | BM_RTC_CTRL_ALARM_IRQ_EN, stmp3xxx_clearl(STMP3XXX_RTC_CTRL_ONEMSEC_IRQ_EN |
rtc_data->io + HW_RTC_CTRL); STMP3XXX_RTC_CTRL_ALARM_IRQ_EN,
rtc_data->io + STMP3XXX_RTC_CTRL);
rtc_device_unregister(rtc_data->rtc); rtc_device_unregister(rtc_data->rtc);
out_remap: out_remap:
iounmap(rtc_data->io); iounmap(rtc_data->io);
...@@ -250,10 +273,10 @@ static int stmp3xxx_rtc_resume(struct platform_device *dev) ...@@ -250,10 +273,10 @@ static int stmp3xxx_rtc_resume(struct platform_device *dev)
struct stmp3xxx_rtc_data *rtc_data = platform_get_drvdata(dev); struct stmp3xxx_rtc_data *rtc_data = platform_get_drvdata(dev);
stmp3xxx_reset_block(rtc_data->io, true); stmp3xxx_reset_block(rtc_data->io, true);
stmp3xxx_clearl(BM_RTC_PERSISTENT0_ALARM_EN | stmp3xxx_clearl(STMP3XXX_RTC_PERSISTENT0_ALARM_EN |
BM_RTC_PERSISTENT0_ALARM_WAKE_EN | STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE_EN |
BM_RTC_PERSISTENT0_ALARM_WAKE, STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE,
rtc_data->io + HW_RTC_PERSISTENT0); rtc_data->io + STMP3XXX_RTC_PERSISTENT0);
return 0; return 0;
} }
#else #else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7