Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rtc: stmp3xxx: Remove UIE handlers

Browse source 
The RTC core handles UIE since 6610e08 (RTC: Rework RTC code to use
timerqueue for events), so remove the specific interrupt in this driver.
To make it work at all, enable interrupts in set_alarm() if needed. Drop
IRQF_DISABLED which is deprecated, while we are here.  Finally, add my
copyright after all these changes.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Tested-by: Shawn Guo <shawn.guo@freescale.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
This commit is contained in:
Wolfram Sang 2011-05-25 12:56:53 +02:00 committed by John Stultz
parent b5167159d4
commit 7e794cb7e3
1 changed files with 18 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
drivers/rtc/rtc-stmp3xxx.c
View file

@ -6,6 +6,7 @@
* *
* Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved. * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
* Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved. * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
* Copyright 2011 Wolfram Sang, Pengutronix e.K.
*/ */
/* /*
@ -33,7 +34,6 @@
#define STMP3XXX_RTC_CTRL_ALARM_IRQ_EN 0x00000001 #define STMP3XXX_RTC_CTRL_ALARM_IRQ_EN 0x00000001
#define STMP3XXX_RTC_CTRL_ONEMSEC_IRQ_EN 0x00000002 #define STMP3XXX_RTC_CTRL_ONEMSEC_IRQ_EN 0x00000002
#define STMP3XXX_RTC_CTRL_ALARM_IRQ 0x00000004 #define STMP3XXX_RTC_CTRL_ALARM_IRQ 0x00000004
#define STMP3XXX_RTC_CTRL_ONEMSEC_IRQ 0x00000008
#define STMP3XXX_RTC_STAT 0x10 #define STMP3XXX_RTC_STAT 0x10
#define STMP3XXX_RTC_STAT_STALE_SHIFT 16 #define STMP3XXX_RTC_STAT_STALE_SHIFT 16
@ -52,9 +52,8 @@
struct stmp3xxx_rtc_data { struct stmp3xxx_rtc_data {
struct rtc_device *rtc; struct rtc_device *rtc;
unsigned irq_count;
void __iomem *io; void __iomem *io;
int irq_alarm, irq_1msec; int irq_alarm;
}; };
static void stmp3xxx_wait_time(struct stmp3xxx_rtc_data *rtc_data) static void stmp3xxx_wait_time(struct stmp3xxx_rtc_data *rtc_data)
@ -92,32 +91,16 @@ static int stmp3xxx_rtc_set_mmss(struct device *dev, unsigned long t)
static irqreturn_t stmp3xxx_rtc_interrupt(int irq, void *dev_id) static irqreturn_t stmp3xxx_rtc_interrupt(int irq, void *dev_id)
{ {
struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev_id); struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev_id);
u32 status; u32 status = readl(rtc_data->io + STMP3XXX_RTC_CTRL);
u32 events = 0;
status = readl(rtc_data->io + STMP3XXX_RTC_CTRL) &
(STMP3XXX_RTC_CTRL_ALARM_IRQ |
STMP3XXX_RTC_CTRL_ONEMSEC_IRQ);
if (status & STMP3XXX_RTC_CTRL_ALARM_IRQ) { if (status & STMP3XXX_RTC_CTRL_ALARM_IRQ) {
writel(STMP3XXX_RTC_CTRL_ALARM_IRQ, writel(STMP3XXX_RTC_CTRL_ALARM_IRQ,
rtc_data->io + STMP3XXX_RTC_CTRL_CLR); rtc_data->io + STMP3XXX_RTC_CTRL_CLR);
events |= RTC_AF | RTC_IRQF; rtc_update_irq(rtc_data->rtc, 1, RTC_AF | RTC_IRQF);
return IRQ_HANDLED;
} }
if (status & STMP3XXX_RTC_CTRL_ONEMSEC_IRQ) { return IRQ_NONE;
writel(STMP3XXX_RTC_CTRL_ONEMSEC_IRQ,
rtc_data->io + STMP3XXX_RTC_CTRL_CLR);
if (++rtc_data->irq_count % 1000 == 0) {
events |= RTC_UF | RTC_IRQF;
rtc_data->irq_count = 0;
}
}
if (events)
rtc_update_irq(rtc_data->rtc, 1, events);
return IRQ_HANDLED;
} }
static int stmp3xxx_alarm_irq_enable(struct device *dev, unsigned int enabled) static int stmp3xxx_alarm_irq_enable(struct device *dev, unsigned int enabled)
@ -155,6 +138,9 @@ static int stmp3xxx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
rtc_tm_to_time(&alm->time, &t); rtc_tm_to_time(&alm->time, &t);
writel(t, rtc_data->io + STMP3XXX_RTC_ALARM); writel(t, rtc_data->io + STMP3XXX_RTC_ALARM);
stmp3xxx_alarm_irq_enable(dev, alm->enabled);
return 0; return 0;
} }
@ -174,11 +160,9 @@ static int stmp3xxx_rtc_remove(struct platform_device *pdev)
if (!rtc_data) if (!rtc_data)
return 0; return 0;
writel(STMP3XXX_RTC_CTRL_ONEMSEC_IRQ_EN | writel(STMP3XXX_RTC_CTRL_ALARM_IRQ_EN,
STMP3XXX_RTC_CTRL_ALARM_IRQ_EN,
rtc_data->io + STMP3XXX_RTC_CTRL_CLR); rtc_data->io + STMP3XXX_RTC_CTRL_CLR);
free_irq(rtc_data->irq_alarm, &pdev->dev); free_irq(rtc_data->irq_alarm, &pdev->dev);
free_irq(rtc_data->irq_1msec, &pdev->dev);
rtc_device_unregister(rtc_data->rtc); rtc_device_unregister(rtc_data->rtc);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
iounmap(rtc_data->io); iounmap(rtc_data->io);
@ -212,7 +196,6 @@ 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);
if (!(readl(STMP3XXX_RTC_STAT + rtc_data->io) & if (!(readl(STMP3XXX_RTC_STAT + rtc_data->io) &
STMP3XXX_RTC_STAT_RTC_PRESENT)) { STMP3XXX_RTC_STAT_RTC_PRESENT)) {
@ -229,6 +212,10 @@ static int stmp3xxx_rtc_probe(struct platform_device *pdev)
STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE, STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE,
rtc_data->io + STMP3XXX_RTC_PERSISTENT0_CLR); rtc_data->io + STMP3XXX_RTC_PERSISTENT0_CLR);
writel(STMP3XXX_RTC_CTRL_ONEMSEC_IRQ_EN |
STMP3XXX_RTC_CTRL_ALARM_IRQ_EN,
rtc_data->io + STMP3XXX_RTC_CTRL_CLR);
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)) {
@ -236,30 +223,17 @@ static int stmp3xxx_rtc_probe(struct platform_device *pdev)
goto out_remap; goto out_remap;
} }
rtc_data->irq_count = 0; err = request_irq(rtc_data->irq_alarm, stmp3xxx_rtc_interrupt, 0,
err = request_irq(rtc_data->irq_alarm, stmp3xxx_rtc_interrupt, "RTC alarm", &pdev->dev);
IRQF_DISABLED, "RTC alarm", &pdev->dev);
if (err) { if (err) {
dev_err(&pdev->dev, "Cannot claim IRQ%d\n", dev_err(&pdev->dev, "Cannot claim IRQ%d\n",
rtc_data->irq_alarm); rtc_data->irq_alarm);
goto out_irq_alarm; goto out_irq_alarm;
} }
err = request_irq(rtc_data->irq_1msec, stmp3xxx_rtc_interrupt,
IRQF_DISABLED, "RTC tick", &pdev->dev);
if (err) {
dev_err(&pdev->dev, "Cannot claim IRQ%d\n",
rtc_data->irq_1msec);
goto out_irq1;
}
return 0; return 0;
out_irq1:
free_irq(rtc_data->irq_alarm, &pdev->dev);
out_irq_alarm: out_irq_alarm:
writel(STMP3XXX_RTC_CTRL_ONEMSEC_IRQ_EN |
STMP3XXX_RTC_CTRL_ALARM_IRQ_EN,
rtc_data->io + STMP3XXX_RTC_CTRL_CLR);
rtc_device_unregister(rtc_data->rtc); rtc_device_unregister(rtc_data->rtc);
out_remap: out_remap:
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
@ -316,5 +290,6 @@ module_init(stmp3xxx_rtc_init);
module_exit(stmp3xxx_rtc_exit); module_exit(stmp3xxx_rtc_exit);
MODULE_DESCRIPTION("STMP3xxx RTC Driver"); MODULE_DESCRIPTION("STMP3xxx RTC Driver");
MODULE_AUTHOR("dmitry pervushin <dpervushin@embeddedalley.com>"); MODULE_AUTHOR("dmitry pervushin <dpervushin@embeddedalley.com> and "
"Wolfram Sang <w.sang@pengutronix.de>");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");