* [PATCH 00/10] [RFC] RTC: Cleanups for 2.6.39
@ 2011-02-21 23:55 John Stultz
2011-02-21 23:55 ` [PATCH 01/10] RTC: Cleanup rtc_class_ops->irq_set_state John Stultz
` (9 more replies)
0 siblings, 10 replies; 32+ messages in thread
From: John Stultz @ 2011-02-21 23:55 UTC (permalink / raw)
To: LKML
Cc: John Stultz, Thomas Gleixner, Alessandro Zummo,
Marcelo Roberto Jimenez, rtc-linux
I believe all the RTC regressions in 2.6.38 are addressed,
so I wanted to send these changes out for comment before
I push them to Thomas and the -tip tree for testing and
hopeful inclusion into 2.6.39.
Now that the generic RTC layer is virtualizing the various
legacy irq modes, and managing the hardware itself instead
of exposing the hardware functions directly to userland, it
greatly simplifies what is required from an RTC driver.
No longer do we use the irq_set_state, irq_set_freq,
update_irq_enable and read_alarm function in the hardware
specific RTC drivers. So that code can be removed.
This really does take a buzzsaw to the code, so I want to
make sure there really are no objections to removing it
before we do so.
There may also be some further driver specific cleanups
needed. For example, included in this set are Marcelo's
changes to the sa1100 rtc driver to further reduce the
amount of driver level code.
Let me know what you think.
thanks
-john
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Alessandro Zummo <a.zummo@towertech.it>
CC: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br>
CC: rtc-linux@googlegroups.com
John Stultz (6):
RTC: Cleanup rtc_class_ops->irq_set_state
RTC: Cleanup rtc_class_ops->irq_set_freq()
RTC: Cleanup rtc_class_ops->update_irq_enable()
RTC: Cleanup rtc_class_ops->read_alarm()
RTC: Clean out UIE icotl implementations
RTC: Fix up rtc.txt documentation to reflect changes to generic rtc
layer
Marcelo Roberto Jimenez (4):
RTC: Include information about UIE and PIE in RTC driver proc.
RTC: Remove UIE and PIE information from the sa1100 driver proc.
RTC: Fix the cross interrupt issue on rtc-test.
RTC: sa1100: Update the sa1100 RTC driver.
Documentation/rtc.txt | 29 +++-----
drivers/rtc/interface.c | 3 +-
drivers/rtc/rtc-ab3100.c | 34 --------
drivers/rtc/rtc-ab8500.c | 40 ----------
drivers/rtc/rtc-at32ap700x.c | 14 ----
drivers/rtc/rtc-at91rm9200.c | 50 ------------
drivers/rtc/rtc-at91sam9.c | 55 -------------
drivers/rtc/rtc-bfin.c | 38 ---------
drivers/rtc/rtc-cmos.c | 139 ----------------------------------
drivers/rtc/rtc-coh901331.c | 14 ----
drivers/rtc/rtc-davinci.c | 93 -----------------------
drivers/rtc/rtc-ds1286.c | 24 ------
drivers/rtc/rtc-ds1305.c | 62 +---------------
drivers/rtc/rtc-ds1307.c | 52 -------------
drivers/rtc/rtc-ds1374.c | 43 -----------
drivers/rtc/rtc-ds1511.c | 35 ---------
drivers/rtc/rtc-ds1553.c | 33 --------
drivers/rtc/rtc-ds3232.c | 66 ----------------
drivers/rtc/rtc-efi.c | 20 -----
drivers/rtc/rtc-fm3130.c | 59 --------------
drivers/rtc/rtc-imxdi.c | 27 -------
drivers/rtc/rtc-isl1208.c | 40 ----------
drivers/rtc/rtc-jz4740.c | 26 ------
drivers/rtc/rtc-lpc32xx.c | 14 ----
drivers/rtc/rtc-m41t80.c | 50 ------------
drivers/rtc/rtc-m48t59.c | 48 ------------
drivers/rtc/rtc-max8925.c | 31 --------
drivers/rtc/rtc-max8998.c | 32 --------
drivers/rtc/rtc-mc13xxx.c | 50 ------------
drivers/rtc/rtc-mpc5121.c | 33 --------
drivers/rtc/rtc-mrst.c | 52 -------------
drivers/rtc/rtc-mv.c | 38 ---------
drivers/rtc/rtc-mxc.c | 25 ------
drivers/rtc/rtc-nuc900.c | 27 -------
drivers/rtc/rtc-omap.c | 61 ---------------
drivers/rtc/rtc-pcap.c | 27 -------
drivers/rtc/rtc-pcf50633.c | 46 +-----------
drivers/rtc/rtc-pl030.c | 15 ----
drivers/rtc/rtc-pl031.c | 84 --------------------
drivers/rtc/rtc-proc.c | 8 ++
drivers/rtc/rtc-pxa.c | 60 ---------------
drivers/rtc/rtc-rs5c372.c | 90 ----------------------
drivers/rtc/rtc-rx8025.c | 71 -----------------
drivers/rtc/rtc-s3c.c | 94 -----------------------
drivers/rtc/rtc-sa1100.c | 172 +----------------------------------------
drivers/rtc/rtc-sh.c | 64 ----------------
drivers/rtc/rtc-stk17ta8.c | 16 ----
drivers/rtc/rtc-stmp3xxx.c | 24 ------
drivers/rtc/rtc-test.c | 20 ++---
drivers/rtc/rtc-twl.c | 44 -----------
drivers/rtc/rtc-tx4939.c | 30 -------
drivers/rtc/rtc-vr41xx.c | 52 -------------
drivers/rtc/rtc-wm831x.c | 52 -------------
drivers/rtc/rtc-wm8350.c | 71 -----------------
drivers/rtc/rtc-x1205.c | 26 ------
include/linux/rtc.h | 5 -
56 files changed, 36 insertions(+), 2492 deletions(-)
--
1.7.3.2.146.gca209
^ permalink raw reply [flat|nested] 32+ messages in thread* [PATCH 01/10] RTC: Cleanup rtc_class_ops->irq_set_state 2011-02-21 23:55 [PATCH 00/10] [RFC] RTC: Cleanups for 2.6.39 John Stultz @ 2011-02-21 23:55 ` John Stultz 2011-02-21 23:55 ` [PATCH 02/10] RTC: Cleanup rtc_class_ops->irq_set_freq() John Stultz ` (8 subsequent siblings) 9 siblings, 0 replies; 32+ messages in thread From: John Stultz @ 2011-02-21 23:55 UTC (permalink / raw) To: LKML Cc: John Stultz, Thomas Gleixner, Alessandro Zummo, Marcelo Roberto Jimenez, rtc-linux With PIE mode interrupts now emulated in generic code via an hrtimer, no one calls rtc_class_ops->irq_set_state(), so this patch removes it along with driver implementations. CC: Thomas Gleixner <tglx@linutronix.de> CC: Alessandro Zummo <a.zummo@towertech.it> CC: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br> CC: rtc-linux@googlegroups.com Signed-off-by: John Stultz <john.stultz@linaro.org> --- drivers/rtc/rtc-cmos.c | 20 -------------------- drivers/rtc/rtc-davinci.c | 34 ---------------------------------- drivers/rtc/rtc-mrst.c | 20 -------------------- drivers/rtc/rtc-pl031.c | 34 ---------------------------------- drivers/rtc/rtc-pxa.c | 13 ------------- drivers/rtc/rtc-rx8025.c | 25 ------------------------- drivers/rtc/rtc-s3c.c | 32 -------------------------------- drivers/rtc/rtc-sa1100.c | 18 ------------------ drivers/rtc/rtc-sh.c | 1 - drivers/rtc/rtc-vr41xx.c | 11 ----------- include/linux/rtc.h | 1 - 11 files changed, 0 insertions(+), 209 deletions(-) diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index c7ff8df..de632e7 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c @@ -400,25 +400,6 @@ static int cmos_irq_set_freq(struct device *dev, int freq) return 0; } -static int cmos_irq_set_state(struct device *dev, int enabled) -{ - struct cmos_rtc *cmos = dev_get_drvdata(dev); - unsigned long flags; - - if (!is_valid_irq(cmos->irq)) - return -ENXIO; - - spin_lock_irqsave(&rtc_lock, flags); - - if (enabled) - cmos_irq_enable(cmos, RTC_PIE); - else - cmos_irq_disable(cmos, RTC_PIE); - - spin_unlock_irqrestore(&rtc_lock, flags); - return 0; -} - static int cmos_alarm_irq_enable(struct device *dev, unsigned int enabled) { struct cmos_rtc *cmos = dev_get_drvdata(dev); @@ -502,7 +483,6 @@ static const struct rtc_class_ops cmos_rtc_ops = { .set_alarm = cmos_set_alarm, .proc = cmos_procfs, .irq_set_freq = cmos_irq_set_freq, - .irq_set_state = cmos_irq_set_state, .alarm_irq_enable = cmos_alarm_irq_enable, .update_irq_enable = cmos_update_irq_enable, }; diff --git a/drivers/rtc/rtc-davinci.c b/drivers/rtc/rtc-davinci.c index 34647fc..92da73d 100644 --- a/drivers/rtc/rtc-davinci.c +++ b/drivers/rtc/rtc-davinci.c @@ -473,39 +473,6 @@ static int davinci_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm) return 0; } -static int davinci_rtc_irq_set_state(struct device *dev, int enabled) -{ - struct davinci_rtc *davinci_rtc = dev_get_drvdata(dev); - unsigned long flags; - u8 rtc_ctrl; - - spin_lock_irqsave(&davinci_rtc_lock, flags); - - rtc_ctrl = rtcss_read(davinci_rtc, PRTCSS_RTC_CTRL); - - if (enabled) { - while (rtcss_read(davinci_rtc, PRTCSS_RTC_CTRL) - & PRTCSS_RTC_CTRL_WDTBUS) - cpu_relax(); - - rtc_ctrl |= PRTCSS_RTC_CTRL_TE; - rtcss_write(davinci_rtc, rtc_ctrl, PRTCSS_RTC_CTRL); - - rtcss_write(davinci_rtc, 0x0, PRTCSS_RTC_CLKC_CNT); - - rtc_ctrl |= PRTCSS_RTC_CTRL_TIEN | - PRTCSS_RTC_CTRL_TMMD | - PRTCSS_RTC_CTRL_TMRFLG; - } else - rtc_ctrl &= ~PRTCSS_RTC_CTRL_TIEN; - - rtcss_write(davinci_rtc, rtc_ctrl, PRTCSS_RTC_CTRL); - - spin_unlock_irqrestore(&davinci_rtc_lock, flags); - - return 0; -} - static int davinci_rtc_irq_set_freq(struct device *dev, int freq) { struct davinci_rtc *davinci_rtc = dev_get_drvdata(dev); @@ -529,7 +496,6 @@ static struct rtc_class_ops davinci_rtc_ops = { .alarm_irq_enable = davinci_rtc_alarm_irq_enable, .read_alarm = davinci_rtc_read_alarm, .set_alarm = davinci_rtc_set_alarm, - .irq_set_state = davinci_rtc_irq_set_state, .irq_set_freq = davinci_rtc_irq_set_freq, }; diff --git a/drivers/rtc/rtc-mrst.c b/drivers/rtc/rtc-mrst.c index 1db62db..4db96fa 100644 --- a/drivers/rtc/rtc-mrst.c +++ b/drivers/rtc/rtc-mrst.c @@ -236,25 +236,6 @@ static int mrst_set_alarm(struct device *dev, struct rtc_wkalrm *t) return 0; } -static int mrst_irq_set_state(struct device *dev, int enabled) -{ - struct mrst_rtc *mrst = dev_get_drvdata(dev); - unsigned long flags; - - if (!mrst->irq) - return -ENXIO; - - spin_lock_irqsave(&rtc_lock, flags); - - if (enabled) - mrst_irq_enable(mrst, RTC_PIE); - else - mrst_irq_disable(mrst, RTC_PIE); - - spin_unlock_irqrestore(&rtc_lock, flags); - return 0; -} - /* Currently, the vRTC doesn't support UIE ON/OFF */ static int mrst_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) { @@ -301,7 +282,6 @@ static const struct rtc_class_ops mrst_rtc_ops = { .read_alarm = mrst_read_alarm, .set_alarm = mrst_set_alarm, .proc = mrst_procfs, - .irq_set_state = mrst_irq_set_state, .alarm_irq_enable = mrst_rtc_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c index b7a6690..0e7c15b 100644 --- a/drivers/rtc/rtc-pl031.c +++ b/drivers/rtc/rtc-pl031.c @@ -293,38 +293,6 @@ static int pl031_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) return ret; } -/* Periodic interrupt is only available in ST variants. */ -static int pl031_irq_set_state(struct device *dev, int enabled) -{ - struct pl031_local *ldata = dev_get_drvdata(dev); - - if (enabled == 1) { - /* Clear any pending timer interrupt. */ - writel(RTC_BIT_PI, ldata->base + RTC_ICR); - - writel(readl(ldata->base + RTC_IMSC) | RTC_BIT_PI, - ldata->base + RTC_IMSC); - - /* Now start the timer */ - writel(readl(ldata->base + RTC_TCR) | RTC_TCR_EN, - ldata->base + RTC_TCR); - - } else { - writel(readl(ldata->base + RTC_IMSC) & (~RTC_BIT_PI), - ldata->base + RTC_IMSC); - - /* Also stop the timer */ - writel(readl(ldata->base + RTC_TCR) & (~RTC_TCR_EN), - ldata->base + RTC_TCR); - } - /* Wait at least 1 RTC32 clock cycle to ensure next access - * to RTC_TCR will succeed. - */ - udelay(40); - - return 0; -} - static int pl031_irq_set_freq(struct device *dev, int freq) { struct pl031_local *ldata = dev_get_drvdata(dev); @@ -440,7 +408,6 @@ static struct rtc_class_ops stv1_pl031_ops = { .read_alarm = pl031_read_alarm, .set_alarm = pl031_set_alarm, .alarm_irq_enable = pl031_alarm_irq_enable, - .irq_set_state = pl031_irq_set_state, .irq_set_freq = pl031_irq_set_freq, }; @@ -451,7 +418,6 @@ static struct rtc_class_ops stv2_pl031_ops = { .read_alarm = pl031_stv2_read_alarm, .set_alarm = pl031_stv2_set_alarm, .alarm_irq_enable = pl031_alarm_irq_enable, - .irq_set_state = pl031_irq_set_state, .irq_set_freq = pl031_irq_set_freq, }; diff --git a/drivers/rtc/rtc-pxa.c b/drivers/rtc/rtc-pxa.c index 29e867a..b216ae5 100644 --- a/drivers/rtc/rtc-pxa.c +++ b/drivers/rtc/rtc-pxa.c @@ -223,18 +223,6 @@ static int pxa_periodic_irq_set_freq(struct device *dev, int freq) return 0; } -static int pxa_periodic_irq_set_state(struct device *dev, int enabled) -{ - struct pxa_rtc *pxa_rtc = dev_get_drvdata(dev); - - if (enabled) - rtsr_set_bits(pxa_rtc, RTSR_PIALE | RTSR_PICE); - else - rtsr_clear_bits(pxa_rtc, RTSR_PIALE | RTSR_PICE); - - return 0; -} - static int pxa_alarm_irq_enable(struct device *dev, unsigned int enabled) { struct pxa_rtc *pxa_rtc = dev_get_drvdata(dev); @@ -348,7 +336,6 @@ static const struct rtc_class_ops pxa_rtc_ops = { .alarm_irq_enable = pxa_alarm_irq_enable, .update_irq_enable = pxa_update_irq_enable, .proc = pxa_rtc_proc, - .irq_set_state = pxa_periodic_irq_set_state, .irq_set_freq = pxa_periodic_irq_set_freq, }; diff --git a/drivers/rtc/rtc-rx8025.c b/drivers/rtc/rtc-rx8025.c index af32a62..fde172f 100644 --- a/drivers/rtc/rtc-rx8025.c +++ b/drivers/rtc/rtc-rx8025.c @@ -424,37 +424,12 @@ static int rx8025_alarm_irq_enable(struct device *dev, unsigned int enabled) return 0; } -static int rx8025_irq_set_state(struct device *dev, int enabled) -{ - struct i2c_client *client = to_i2c_client(dev); - struct rx8025_data *rx8025 = i2c_get_clientdata(client); - int ctrl1; - int err; - - if (client->irq <= 0) - return -ENXIO; - - ctrl1 = rx8025->ctrl1 & ~RX8025_BIT_CTRL1_CT; - if (enabled) - ctrl1 |= RX8025_BIT_CTRL1_CT_1HZ; - if (ctrl1 != rx8025->ctrl1) { - rx8025->ctrl1 = ctrl1; - err = rx8025_write_reg(rx8025->client, RX8025_REG_CTRL1, - rx8025->ctrl1); - if (err) - return err; - } - - return 0; -} - static struct rtc_class_ops rx8025_rtc_ops = { .read_time = rx8025_get_time, .set_time = rx8025_set_time, .read_alarm = rx8025_read_alarm, .set_alarm = rx8025_set_alarm, .alarm_irq_enable = rx8025_alarm_irq_enable, - .irq_set_state = rx8025_irq_set_state, }; /* diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c index cf953ec..1dd2678 100644 --- a/drivers/rtc/rtc-s3c.c +++ b/drivers/rtc/rtc-s3c.c @@ -91,37 +91,6 @@ static void s3c_rtc_setaie(int to) writeb(tmp, s3c_rtc_base + S3C2410_RTCALM); } -static int s3c_rtc_setpie(struct device *dev, int enabled) -{ - unsigned int tmp; - - pr_debug("%s: pie=%d\n", __func__, enabled); - - spin_lock_irq(&s3c_rtc_pie_lock); - - if (s3c_rtc_cpu_type == TYPE_S3C64XX) { - tmp = readw(s3c_rtc_base + S3C2410_RTCCON); - tmp &= ~S3C64XX_RTCCON_TICEN; - - if (enabled) - tmp |= S3C64XX_RTCCON_TICEN; - - writew(tmp, s3c_rtc_base + S3C2410_RTCCON); - } else { - tmp = readb(s3c_rtc_base + S3C2410_TICNT); - tmp &= ~S3C2410_TICNT_ENABLE; - - if (enabled) - tmp |= S3C2410_TICNT_ENABLE; - - writeb(tmp, s3c_rtc_base + S3C2410_TICNT); - } - - spin_unlock_irq(&s3c_rtc_pie_lock); - - return 0; -} - static int s3c_rtc_setfreq(struct device *dev, int freq) { struct platform_device *pdev = to_platform_device(dev); @@ -378,7 +347,6 @@ static const struct rtc_class_ops s3c_rtcops = { .read_alarm = s3c_rtc_getalarm, .set_alarm = s3c_rtc_setalarm, .irq_set_freq = s3c_rtc_setfreq, - .irq_set_state = s3c_rtc_setpie, .proc = s3c_rtc_proc, .alarm_irq_enable = s3c_rtc_setaie, }; diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c index 5dfe5ff..d47b3fc 100644 --- a/drivers/rtc/rtc-sa1100.c +++ b/drivers/rtc/rtc-sa1100.c @@ -171,23 +171,6 @@ static int sa1100_irq_set_freq(struct device *dev, int freq) static int rtc_timer1_count; -static int sa1100_irq_set_state(struct device *dev, int enabled) -{ - spin_lock_irq(&sa1100_rtc_lock); - if (enabled) { - struct rtc_device *rtc = (struct rtc_device *)dev; - - OSMR1 = timer_freq / rtc->irq_freq + OSCR; - OIER |= OIER_E1; - rtc_timer1_count = 1; - } else { - OIER &= ~OIER_E1; - } - spin_unlock_irq(&sa1100_rtc_lock); - - return 0; -} - static inline int sa1100_timer1_retrigger(struct rtc_device *rtc) { unsigned long diff; @@ -410,7 +393,6 @@ static const struct rtc_class_ops sa1100_rtc_ops = { .set_alarm = sa1100_rtc_set_alarm, .proc = sa1100_rtc_proc, .irq_set_freq = sa1100_irq_set_freq, - .irq_set_state = sa1100_irq_set_state, .alarm_irq_enable = sa1100_rtc_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c index 93314a9..ff50a8b 100644 --- a/drivers/rtc/rtc-sh.c +++ b/drivers/rtc/rtc-sh.c @@ -603,7 +603,6 @@ static struct rtc_class_ops sh_rtc_ops = { .set_time = sh_rtc_set_time, .read_alarm = sh_rtc_read_alarm, .set_alarm = sh_rtc_set_alarm, - .irq_set_state = sh_rtc_irq_set_state, .irq_set_freq = sh_rtc_irq_set_freq, .proc = sh_rtc_proc, .alarm_irq_enable = sh_rtc_alarm_irq_enable, diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c index 769190a..86f1490 100644 --- a/drivers/rtc/rtc-vr41xx.c +++ b/drivers/rtc/rtc-vr41xx.c @@ -227,16 +227,6 @@ static int vr41xx_rtc_irq_set_freq(struct device *dev, int freq) return 0; } -static int vr41xx_rtc_irq_set_state(struct device *dev, int enabled) -{ - if (enabled) - enable_irq(pie_irq); - else - disable_irq(pie_irq); - - return 0; -} - static int vr41xx_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg) { switch (cmd) { @@ -309,7 +299,6 @@ static const struct rtc_class_ops vr41xx_rtc_ops = { .read_alarm = vr41xx_rtc_read_alarm, .set_alarm = vr41xx_rtc_set_alarm, .irq_set_freq = vr41xx_rtc_irq_set_freq, - .irq_set_state = vr41xx_rtc_irq_set_state, }; static int __devinit rtc_probe(struct platform_device *pdev) diff --git a/include/linux/rtc.h b/include/linux/rtc.h index 89c3e51..40bbe77 100644 --- a/include/linux/rtc.h +++ b/include/linux/rtc.h @@ -148,7 +148,6 @@ struct rtc_class_ops { int (*set_alarm)(struct device *, struct rtc_wkalrm *); int (*proc)(struct device *, struct seq_file *); int (*set_mmss)(struct device *, unsigned long secs); - int (*irq_set_state)(struct device *, int enabled); int (*irq_set_freq)(struct device *, int freq); int (*read_callback)(struct device *, int data); int (*alarm_irq_enable)(struct device *, unsigned int enabled); -- 1.7.3.2.146.gca209 ^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH 02/10] RTC: Cleanup rtc_class_ops->irq_set_freq() 2011-02-21 23:55 [PATCH 00/10] [RFC] RTC: Cleanups for 2.6.39 John Stultz 2011-02-21 23:55 ` [PATCH 01/10] RTC: Cleanup rtc_class_ops->irq_set_state John Stultz @ 2011-02-21 23:55 ` John Stultz 2011-02-21 23:55 ` [PATCH 03/10] RTC: Cleanup rtc_class_ops->update_irq_enable() John Stultz ` (7 subsequent siblings) 9 siblings, 0 replies; 32+ messages in thread From: John Stultz @ 2011-02-21 23:55 UTC (permalink / raw) To: LKML Cc: John Stultz, Thomas Gleixner, Alessandro Zummo, Marcelo Roberto Jimenez, rtc-linux With the generic rtc code now emulating PIE mode irqs via an hrtimer, no one calls the rtc_class_ops->irq_set_freq call. This patch removes the hook and deletes the driver functions if no one else calls them. CC: Thomas Gleixner <tglx@linutronix.de> CC: Alessandro Zummo <a.zummo@towertech.it> CC: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br> CC: rtc-linux@googlegroups.com Signed-off-by: John Stultz <john.stultz@linaro.org> --- drivers/rtc/rtc-cmos.c | 26 -------------------------- drivers/rtc/rtc-davinci.c | 17 ----------------- drivers/rtc/rtc-pl031.c | 21 --------------------- drivers/rtc/rtc-pxa.c | 15 --------------- drivers/rtc/rtc-s3c.c | 1 - drivers/rtc/rtc-sa1100.c | 1 - drivers/rtc/rtc-sh.c | 1 - drivers/rtc/rtc-vr41xx.c | 21 --------------------- include/linux/rtc.h | 2 -- 9 files changed, 0 insertions(+), 105 deletions(-) diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index de632e7..bdb1f8e 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c @@ -375,31 +375,6 @@ static int cmos_set_alarm(struct device *dev, struct rtc_wkalrm *t) return 0; } -static int cmos_irq_set_freq(struct device *dev, int freq) -{ - struct cmos_rtc *cmos = dev_get_drvdata(dev); - int f; - unsigned long flags; - - if (!is_valid_irq(cmos->irq)) - return -ENXIO; - - if (!is_power_of_2(freq)) - return -EINVAL; - /* 0 = no irqs; 1 = 2^15 Hz ... 15 = 2^0 Hz */ - f = ffs(freq); - if (f-- > 16) - return -EINVAL; - f = 16 - f; - - spin_lock_irqsave(&rtc_lock, flags); - hpet_set_periodic_freq(freq); - CMOS_WRITE(RTC_REF_CLCK_32KHZ | f, RTC_FREQ_SELECT); - spin_unlock_irqrestore(&rtc_lock, flags); - - return 0; -} - static int cmos_alarm_irq_enable(struct device *dev, unsigned int enabled) { struct cmos_rtc *cmos = dev_get_drvdata(dev); @@ -482,7 +457,6 @@ static const struct rtc_class_ops cmos_rtc_ops = { .read_alarm = cmos_read_alarm, .set_alarm = cmos_set_alarm, .proc = cmos_procfs, - .irq_set_freq = cmos_irq_set_freq, .alarm_irq_enable = cmos_alarm_irq_enable, .update_irq_enable = cmos_update_irq_enable, }; diff --git a/drivers/rtc/rtc-davinci.c b/drivers/rtc/rtc-davinci.c index 92da73d..dfd98a2 100644 --- a/drivers/rtc/rtc-davinci.c +++ b/drivers/rtc/rtc-davinci.c @@ -473,22 +473,6 @@ static int davinci_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm) return 0; } -static int davinci_rtc_irq_set_freq(struct device *dev, int freq) -{ - struct davinci_rtc *davinci_rtc = dev_get_drvdata(dev); - unsigned long flags; - u16 tmr_counter = (0x8000 >> (ffs(freq) - 1)); - - spin_lock_irqsave(&davinci_rtc_lock, flags); - - rtcss_write(davinci_rtc, tmr_counter & 0xFF, PRTCSS_RTC_TMR0); - rtcss_write(davinci_rtc, (tmr_counter & 0xFF00) >> 8, PRTCSS_RTC_TMR1); - - spin_unlock_irqrestore(&davinci_rtc_lock, flags); - - return 0; -} - static struct rtc_class_ops davinci_rtc_ops = { .ioctl = davinci_rtc_ioctl, .read_time = davinci_rtc_read_time, @@ -496,7 +480,6 @@ static struct rtc_class_ops davinci_rtc_ops = { .alarm_irq_enable = davinci_rtc_alarm_irq_enable, .read_alarm = davinci_rtc_read_alarm, .set_alarm = davinci_rtc_set_alarm, - .irq_set_freq = davinci_rtc_irq_set_freq, }; static int __init davinci_rtc_probe(struct platform_device *pdev) diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c index 0e7c15b..d829ea6 100644 --- a/drivers/rtc/rtc-pl031.c +++ b/drivers/rtc/rtc-pl031.c @@ -293,25 +293,6 @@ static int pl031_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) return ret; } -static int pl031_irq_set_freq(struct device *dev, int freq) -{ - struct pl031_local *ldata = dev_get_drvdata(dev); - - /* Cant set timer if it is already enabled */ - if (readl(ldata->base + RTC_TCR) & RTC_TCR_EN) { - dev_err(dev, "can't change frequency while timer enabled\n"); - return -EINVAL; - } - - /* If self start bit in RTC_TCR is set timer will start here, - * but we never set that bit. Instead we start the timer when - * set_state is called with enabled == 1. - */ - writel(RTC_TIMER_FREQ / freq, ldata->base + RTC_TLR); - - return 0; -} - static int pl031_remove(struct amba_device *adev) { struct pl031_local *ldata = dev_get_drvdata(&adev->dev); @@ -408,7 +389,6 @@ static struct rtc_class_ops stv1_pl031_ops = { .read_alarm = pl031_read_alarm, .set_alarm = pl031_set_alarm, .alarm_irq_enable = pl031_alarm_irq_enable, - .irq_set_freq = pl031_irq_set_freq, }; /* And the second ST derivative */ @@ -418,7 +398,6 @@ static struct rtc_class_ops stv2_pl031_ops = { .read_alarm = pl031_stv2_read_alarm, .set_alarm = pl031_stv2_set_alarm, .alarm_irq_enable = pl031_alarm_irq_enable, - .irq_set_freq = pl031_irq_set_freq, }; static struct amba_id pl031_ids[] = { diff --git a/drivers/rtc/rtc-pxa.c b/drivers/rtc/rtc-pxa.c index b216ae5..a1fdc80 100644 --- a/drivers/rtc/rtc-pxa.c +++ b/drivers/rtc/rtc-pxa.c @@ -209,20 +209,6 @@ static void pxa_rtc_release(struct device *dev) free_irq(pxa_rtc->irq_1Hz, dev); } -static int pxa_periodic_irq_set_freq(struct device *dev, int freq) -{ - struct pxa_rtc *pxa_rtc = dev_get_drvdata(dev); - int period_ms; - - if (freq < 1 || freq > MAXFREQ_PERIODIC) - return -EINVAL; - - period_ms = 1000 / freq; - rtc_writel(pxa_rtc, PIAR, period_ms); - - return 0; -} - static int pxa_alarm_irq_enable(struct device *dev, unsigned int enabled) { struct pxa_rtc *pxa_rtc = dev_get_drvdata(dev); @@ -336,7 +322,6 @@ static const struct rtc_class_ops pxa_rtc_ops = { .alarm_irq_enable = pxa_alarm_irq_enable, .update_irq_enable = pxa_update_irq_enable, .proc = pxa_rtc_proc, - .irq_set_freq = pxa_periodic_irq_set_freq, }; static int __init pxa_rtc_probe(struct platform_device *pdev) diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c index 1dd2678..6d60958 100644 --- a/drivers/rtc/rtc-s3c.c +++ b/drivers/rtc/rtc-s3c.c @@ -346,7 +346,6 @@ static const struct rtc_class_ops s3c_rtcops = { .set_time = s3c_rtc_settime, .read_alarm = s3c_rtc_getalarm, .set_alarm = s3c_rtc_setalarm, - .irq_set_freq = s3c_rtc_setfreq, .proc = s3c_rtc_proc, .alarm_irq_enable = s3c_rtc_setaie, }; diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c index d47b3fc..d1a2b0b 100644 --- a/drivers/rtc/rtc-sa1100.c +++ b/drivers/rtc/rtc-sa1100.c @@ -392,7 +392,6 @@ static const struct rtc_class_ops sa1100_rtc_ops = { .read_alarm = sa1100_rtc_read_alarm, .set_alarm = sa1100_rtc_set_alarm, .proc = sa1100_rtc_proc, - .irq_set_freq = sa1100_irq_set_freq, .alarm_irq_enable = sa1100_rtc_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c index ff50a8b..1485449 100644 --- a/drivers/rtc/rtc-sh.c +++ b/drivers/rtc/rtc-sh.c @@ -603,7 +603,6 @@ static struct rtc_class_ops sh_rtc_ops = { .set_time = sh_rtc_set_time, .read_alarm = sh_rtc_read_alarm, .set_alarm = sh_rtc_set_alarm, - .irq_set_freq = sh_rtc_irq_set_freq, .proc = sh_rtc_proc, .alarm_irq_enable = sh_rtc_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c index 86f1490..c5698cd 100644 --- a/drivers/rtc/rtc-vr41xx.c +++ b/drivers/rtc/rtc-vr41xx.c @@ -207,26 +207,6 @@ static int vr41xx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *wkalrm) return 0; } -static int vr41xx_rtc_irq_set_freq(struct device *dev, int freq) -{ - u64 count; - - if (!is_power_of_2(freq)) - return -EINVAL; - count = RTC_FREQUENCY; - do_div(count, freq); - - spin_lock_irq(&rtc_lock); - - periodic_count = count; - rtc1_write(RTCL1LREG, periodic_count); - rtc1_write(RTCL1HREG, periodic_count >> 16); - - spin_unlock_irq(&rtc_lock); - - return 0; -} - static int vr41xx_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg) { switch (cmd) { @@ -298,7 +278,6 @@ static const struct rtc_class_ops vr41xx_rtc_ops = { .set_time = vr41xx_rtc_set_time, .read_alarm = vr41xx_rtc_read_alarm, .set_alarm = vr41xx_rtc_set_alarm, - .irq_set_freq = vr41xx_rtc_irq_set_freq, }; static int __devinit rtc_probe(struct platform_device *pdev) diff --git a/include/linux/rtc.h b/include/linux/rtc.h index 40bbe77..5eb9650 100644 --- a/include/linux/rtc.h +++ b/include/linux/rtc.h @@ -133,7 +133,6 @@ extern struct class *rtc_class; * The (current) exceptions are mostly filesystem hooks: * - the proc() hook for procfs * - non-ioctl() chardev hooks: open(), release(), read_callback() - * - periodic irq calls: irq_set_state(), irq_set_freq() * * REVISIT those periodic irq calls *do* have ops_lock when they're * issued through ioctl() ... @@ -148,7 +147,6 @@ struct rtc_class_ops { int (*set_alarm)(struct device *, struct rtc_wkalrm *); int (*proc)(struct device *, struct seq_file *); int (*set_mmss)(struct device *, unsigned long secs); - int (*irq_set_freq)(struct device *, int freq); int (*read_callback)(struct device *, int data); int (*alarm_irq_enable)(struct device *, unsigned int enabled); int (*update_irq_enable)(struct device *, unsigned int enabled); -- 1.7.3.2.146.gca209 ^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH 03/10] RTC: Cleanup rtc_class_ops->update_irq_enable() 2011-02-21 23:55 [PATCH 00/10] [RFC] RTC: Cleanups for 2.6.39 John Stultz 2011-02-21 23:55 ` [PATCH 01/10] RTC: Cleanup rtc_class_ops->irq_set_state John Stultz 2011-02-21 23:55 ` [PATCH 02/10] RTC: Cleanup rtc_class_ops->irq_set_freq() John Stultz @ 2011-02-21 23:55 ` John Stultz 2011-02-21 23:55 ` [PATCH 04/10] RTC: Cleanup rtc_class_ops->read_alarm() John Stultz ` (6 subsequent siblings) 9 siblings, 0 replies; 32+ messages in thread From: John Stultz @ 2011-02-21 23:55 UTC (permalink / raw) To: LKML Cc: John Stultz, Thomas Gleixner, Alessandro Zummo, Marcelo Roberto Jimenez, rtc-linux Now that the generic code handles UIE mode irqs via periodic alarm interrupts, no one calls the rtc_class_ops->update_irq_enable() method anymore. This patch removes the driver hooks and implementations of update_irq_enable if no one else is calling it. CC: Thomas Gleixner <tglx@linutronix.de> CC: Alessandro Zummo <a.zummo@towertech.it> CC: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br> CC: rtc-linux@googlegroups.com Signed-off-by: John Stultz <john.stultz@linaro.org> --- drivers/rtc/rtc-cmos.c | 20 -------------------- drivers/rtc/rtc-ds1511.c | 17 ----------------- drivers/rtc/rtc-ds1553.c | 17 ----------------- drivers/rtc/rtc-ds3232.c | 18 ------------------ drivers/rtc/rtc-jz4740.c | 7 ------- drivers/rtc/rtc-mc13xxx.c | 7 ------- drivers/rtc/rtc-mpc5121.c | 20 -------------------- drivers/rtc/rtc-mxc.c | 7 ------- drivers/rtc/rtc-nuc900.c | 15 --------------- drivers/rtc/rtc-pcap.c | 6 ------ drivers/rtc/rtc-pcf50633.c | 22 +--------------------- drivers/rtc/rtc-pxa.c | 16 ---------------- drivers/rtc/rtc-stmp3xxx.c | 15 --------------- drivers/rtc/rtc-twl.c | 13 ------------- drivers/rtc/rtc-wm831x.c | 16 ---------------- drivers/rtc/rtc-wm8350.c | 21 --------------------- include/linux/rtc.h | 1 - 17 files changed, 1 insertions(+), 237 deletions(-) diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index bdb1f8e..dc2a0ba 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c @@ -394,25 +394,6 @@ static int cmos_alarm_irq_enable(struct device *dev, unsigned int enabled) return 0; } -static int cmos_update_irq_enable(struct device *dev, unsigned int enabled) -{ - struct cmos_rtc *cmos = dev_get_drvdata(dev); - unsigned long flags; - - if (!is_valid_irq(cmos->irq)) - return -EINVAL; - - spin_lock_irqsave(&rtc_lock, flags); - - if (enabled) - cmos_irq_enable(cmos, RTC_UIE); - else - cmos_irq_disable(cmos, RTC_UIE); - - spin_unlock_irqrestore(&rtc_lock, flags); - return 0; -} - #if defined(CONFIG_RTC_INTF_PROC) || defined(CONFIG_RTC_INTF_PROC_MODULE) static int cmos_procfs(struct device *dev, struct seq_file *seq) @@ -458,7 +439,6 @@ static const struct rtc_class_ops cmos_rtc_ops = { .set_alarm = cmos_set_alarm, .proc = cmos_procfs, .alarm_irq_enable = cmos_alarm_irq_enable, - .update_irq_enable = cmos_update_irq_enable, }; /*----------------------------------------------------------------*/ diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c index 37268e9..3fffd70 100644 --- a/drivers/rtc/rtc-ds1511.c +++ b/drivers/rtc/rtc-ds1511.c @@ -397,29 +397,12 @@ static int ds1511_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) return 0; } -static int ds1511_rtc_update_irq_enable(struct device *dev, - unsigned int enabled) -{ - struct platform_device *pdev = to_platform_device(dev); - struct rtc_plat_data *pdata = platform_get_drvdata(pdev); - - if (pdata->irq <= 0) - return -EINVAL; - if (enabled) - pdata->irqen |= RTC_UF; - else - pdata->irqen &= ~RTC_UF; - ds1511_rtc_update_alarm(pdata); - return 0; -} - static const struct rtc_class_ops ds1511_rtc_ops = { .read_time = ds1511_rtc_read_time, .set_time = ds1511_rtc_set_time, .read_alarm = ds1511_rtc_read_alarm, .set_alarm = ds1511_rtc_set_alarm, .alarm_irq_enable = ds1511_rtc_alarm_irq_enable, - .update_irq_enable = ds1511_rtc_update_irq_enable, }; static ssize_t diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c index ff432e2..fee41b9 100644 --- a/drivers/rtc/rtc-ds1553.c +++ b/drivers/rtc/rtc-ds1553.c @@ -227,29 +227,12 @@ static int ds1553_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) return 0; } -static int ds1553_rtc_update_irq_enable(struct device *dev, - unsigned int enabled) -{ - struct platform_device *pdev = to_platform_device(dev); - struct rtc_plat_data *pdata = platform_get_drvdata(pdev); - - if (pdata->irq <= 0) - return -EINVAL; - if (enabled) - pdata->irqen |= RTC_UF; - else - pdata->irqen &= ~RTC_UF; - ds1553_rtc_update_alarm(pdata); - return 0; -} - static const struct rtc_class_ops ds1553_rtc_ops = { .read_time = ds1553_rtc_read_time, .set_time = ds1553_rtc_set_time, .read_alarm = ds1553_rtc_read_alarm, .set_alarm = ds1553_rtc_set_alarm, .alarm_irq_enable = ds1553_rtc_alarm_irq_enable, - .update_irq_enable = ds1553_rtc_update_irq_enable, }; static ssize_t ds1553_nvram_read(struct file *filp, struct kobject *kobj, diff --git a/drivers/rtc/rtc-ds3232.c b/drivers/rtc/rtc-ds3232.c index 23a9ee1..7608b1b 100644 --- a/drivers/rtc/rtc-ds3232.c +++ b/drivers/rtc/rtc-ds3232.c @@ -335,23 +335,6 @@ static int ds3232_alarm_irq_enable(struct device *dev, unsigned int enabled) return 0; } -static int ds3232_update_irq_enable(struct device *dev, unsigned int enabled) -{ - struct i2c_client *client = to_i2c_client(dev); - struct ds3232 *ds3232 = i2c_get_clientdata(client); - - if (client->irq <= 0) - return -EINVAL; - - if (enabled) - ds3232->rtc->irq_data |= RTC_UF; - else - ds3232->rtc->irq_data &= ~RTC_UF; - - ds3232_update_alarm(client); - return 0; -} - static irqreturn_t ds3232_irq(int irq, void *dev_id) { struct i2c_client *client = dev_id; @@ -402,7 +385,6 @@ static const struct rtc_class_ops ds3232_rtc_ops = { .read_alarm = ds3232_read_alarm, .set_alarm = ds3232_set_alarm, .alarm_irq_enable = ds3232_alarm_irq_enable, - .update_irq_enable = ds3232_update_irq_enable, }; static int __devinit ds3232_probe(struct i2c_client *client, diff --git a/drivers/rtc/rtc-jz4740.c b/drivers/rtc/rtc-jz4740.c index 2e16f72..b647363 100644 --- a/drivers/rtc/rtc-jz4740.c +++ b/drivers/rtc/rtc-jz4740.c @@ -168,12 +168,6 @@ static int jz4740_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) return ret; } -static int jz4740_rtc_update_irq_enable(struct device *dev, unsigned int enable) -{ - struct jz4740_rtc *rtc = dev_get_drvdata(dev); - return jz4740_rtc_ctrl_set_bits(rtc, JZ_RTC_CTRL_1HZ_IRQ, enable); -} - static int jz4740_rtc_alarm_irq_enable(struct device *dev, unsigned int enable) { struct jz4740_rtc *rtc = dev_get_drvdata(dev); @@ -185,7 +179,6 @@ static struct rtc_class_ops jz4740_rtc_ops = { .set_mmss = jz4740_rtc_set_mmss, .read_alarm = jz4740_rtc_read_alarm, .set_alarm = jz4740_rtc_set_alarm, - .update_irq_enable = jz4740_rtc_update_irq_enable, .alarm_irq_enable = jz4740_rtc_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-mc13xxx.c b/drivers/rtc/rtc-mc13xxx.c index 5314b15..c420064 100644 --- a/drivers/rtc/rtc-mc13xxx.c +++ b/drivers/rtc/rtc-mc13xxx.c @@ -282,12 +282,6 @@ static irqreturn_t mc13xxx_rtc_update_handler(int irq, void *dev) return IRQ_HANDLED; } -static int mc13xxx_rtc_update_irq_enable(struct device *dev, - unsigned int enabled) -{ - return mc13xxx_rtc_irq_enable(dev, enabled, MC13XXX_IRQ_1HZ); -} - static int mc13xxx_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) { @@ -300,7 +294,6 @@ static const struct rtc_class_ops mc13xxx_rtc_ops = { .read_alarm = mc13xxx_rtc_read_alarm, .set_alarm = mc13xxx_rtc_set_alarm, .alarm_irq_enable = mc13xxx_rtc_alarm_irq_enable, - .update_irq_enable = mc13xxx_rtc_update_irq_enable, }; static irqreturn_t mc13xxx_rtc_reset_handler(int irq, void *dev) diff --git a/drivers/rtc/rtc-mpc5121.c b/drivers/rtc/rtc-mpc5121.c index dfcdf09..b40c1ff 100644 --- a/drivers/rtc/rtc-mpc5121.c +++ b/drivers/rtc/rtc-mpc5121.c @@ -240,32 +240,12 @@ static int mpc5121_rtc_alarm_irq_enable(struct device *dev, return 0; } -static int mpc5121_rtc_update_irq_enable(struct device *dev, - unsigned int enabled) -{ - struct mpc5121_rtc_data *rtc = dev_get_drvdata(dev); - struct mpc5121_rtc_regs __iomem *regs = rtc->regs; - int val; - - val = in_8(®s->int_enable); - - if (enabled) - val = (val & ~0x8) | 0x1; - else - val &= ~0x1; - - out_8(®s->int_enable, val); - - return 0; -} - static const struct rtc_class_ops mpc5121_rtc_ops = { .read_time = mpc5121_rtc_read_time, .set_time = mpc5121_rtc_set_time, .read_alarm = mpc5121_rtc_read_alarm, .set_alarm = mpc5121_rtc_set_alarm, .alarm_irq_enable = mpc5121_rtc_alarm_irq_enable, - .update_irq_enable = mpc5121_rtc_update_irq_enable, }; static int __devinit mpc5121_rtc_probe(struct platform_device *op, diff --git a/drivers/rtc/rtc-mxc.c b/drivers/rtc/rtc-mxc.c index 0b06c1e..826ab64 100644 --- a/drivers/rtc/rtc-mxc.c +++ b/drivers/rtc/rtc-mxc.c @@ -274,12 +274,6 @@ static int mxc_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) return 0; } -static int mxc_rtc_update_irq_enable(struct device *dev, unsigned int enabled) -{ - mxc_rtc_irq_enable(dev, RTC_1HZ_BIT, enabled); - return 0; -} - /* * This function reads the current RTC time into tm in Gregorian date. */ @@ -368,7 +362,6 @@ static struct rtc_class_ops mxc_rtc_ops = { .read_alarm = mxc_rtc_read_alarm, .set_alarm = mxc_rtc_set_alarm, .alarm_irq_enable = mxc_rtc_alarm_irq_enable, - .update_irq_enable = mxc_rtc_update_irq_enable, }; static int __init mxc_rtc_probe(struct platform_device *pdev) diff --git a/drivers/rtc/rtc-nuc900.c b/drivers/rtc/rtc-nuc900.c index ddb0857..781068d 100644 --- a/drivers/rtc/rtc-nuc900.c +++ b/drivers/rtc/rtc-nuc900.c @@ -134,20 +134,6 @@ static void nuc900_rtc_bin2bcd(struct device *dev, struct rtc_time *settm, gettm->bcd_hour = bin2bcd(settm->tm_hour) << 16; } -static int nuc900_update_irq_enable(struct device *dev, unsigned int enabled) -{ - struct nuc900_rtc *rtc = dev_get_drvdata(dev); - - if (enabled) - __raw_writel(__raw_readl(rtc->rtc_reg + REG_RTC_RIER)| - (TICKINTENB), rtc->rtc_reg + REG_RTC_RIER); - else - __raw_writel(__raw_readl(rtc->rtc_reg + REG_RTC_RIER)& - (~TICKINTENB), rtc->rtc_reg + REG_RTC_RIER); - - return 0; -} - static int nuc900_alarm_irq_enable(struct device *dev, unsigned int enabled) { struct nuc900_rtc *rtc = dev_get_drvdata(dev); @@ -234,7 +220,6 @@ static struct rtc_class_ops nuc900_rtc_ops = { .read_alarm = nuc900_rtc_read_alarm, .set_alarm = nuc900_rtc_set_alarm, .alarm_irq_enable = nuc900_alarm_irq_enable, - .update_irq_enable = nuc900_update_irq_enable, }; static int __devinit nuc900_rtc_probe(struct platform_device *pdev) diff --git a/drivers/rtc/rtc-pcap.c b/drivers/rtc/rtc-pcap.c index 25c0b3f..a633abc 100644 --- a/drivers/rtc/rtc-pcap.c +++ b/drivers/rtc/rtc-pcap.c @@ -131,18 +131,12 @@ static int pcap_rtc_alarm_irq_enable(struct device *dev, unsigned int en) return pcap_rtc_irq_enable(dev, PCAP_IRQ_TODA, en); } -static int pcap_rtc_update_irq_enable(struct device *dev, unsigned int en) -{ - return pcap_rtc_irq_enable(dev, PCAP_IRQ_1HZ, en); -} - static const struct rtc_class_ops pcap_rtc_ops = { .read_time = pcap_rtc_read_time, .read_alarm = pcap_rtc_read_alarm, .set_alarm = pcap_rtc_set_alarm, .set_mmss = pcap_rtc_set_mmss, .alarm_irq_enable = pcap_rtc_alarm_irq_enable, - .update_irq_enable = pcap_rtc_update_irq_enable, }; static int __devinit pcap_rtc_probe(struct platform_device *pdev) diff --git a/drivers/rtc/rtc-pcf50633.c b/drivers/rtc/rtc-pcf50633.c index 16edf94..f90c574 100644 --- a/drivers/rtc/rtc-pcf50633.c +++ b/drivers/rtc/rtc-pcf50633.c @@ -106,25 +106,6 @@ pcf50633_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) return 0; } -static int -pcf50633_rtc_update_irq_enable(struct device *dev, unsigned int enabled) -{ - struct pcf50633_rtc *rtc = dev_get_drvdata(dev); - int err; - - if (enabled) - err = pcf50633_irq_unmask(rtc->pcf, PCF50633_IRQ_SECOND); - else - err = pcf50633_irq_mask(rtc->pcf, PCF50633_IRQ_SECOND); - - if (err < 0) - return err; - - rtc->second_enabled = enabled; - - return 0; -} - static int pcf50633_rtc_read_time(struct device *dev, struct rtc_time *tm) { struct pcf50633_rtc *rtc; @@ -262,8 +243,7 @@ static struct rtc_class_ops pcf50633_rtc_ops = { .set_time = pcf50633_rtc_set_time, .read_alarm = pcf50633_rtc_read_alarm, .set_alarm = pcf50633_rtc_set_alarm, - .alarm_irq_enable = pcf50633_rtc_alarm_irq_enable, - .update_irq_enable = pcf50633_rtc_update_irq_enable, + .alarm_irq_enable = pcf50633_rtc_alarm_irq_enable, }; static void pcf50633_rtc_irq(int irq, void *data) diff --git a/drivers/rtc/rtc-pxa.c b/drivers/rtc/rtc-pxa.c index a1fdc80..fc9f499 100644 --- a/drivers/rtc/rtc-pxa.c +++ b/drivers/rtc/rtc-pxa.c @@ -224,21 +224,6 @@ static int pxa_alarm_irq_enable(struct device *dev, unsigned int enabled) return 0; } -static int pxa_update_irq_enable(struct device *dev, unsigned int enabled) -{ - struct pxa_rtc *pxa_rtc = dev_get_drvdata(dev); - - spin_lock_irq(&pxa_rtc->lock); - - if (enabled) - rtsr_set_bits(pxa_rtc, RTSR_HZE); - else - rtsr_clear_bits(pxa_rtc, RTSR_HZE); - - spin_unlock_irq(&pxa_rtc->lock); - return 0; -} - static int pxa_rtc_read_time(struct device *dev, struct rtc_time *tm) { struct pxa_rtc *pxa_rtc = dev_get_drvdata(dev); @@ -320,7 +305,6 @@ static const struct rtc_class_ops pxa_rtc_ops = { .read_alarm = pxa_rtc_read_alarm, .set_alarm = pxa_rtc_set_alarm, .alarm_irq_enable = pxa_alarm_irq_enable, - .update_irq_enable = pxa_update_irq_enable, .proc = pxa_rtc_proc, }; diff --git a/drivers/rtc/rtc-stmp3xxx.c b/drivers/rtc/rtc-stmp3xxx.c index 7e7d0c8..572e953 100644 --- a/drivers/rtc/rtc-stmp3xxx.c +++ b/drivers/rtc/rtc-stmp3xxx.c @@ -115,19 +115,6 @@ static int stmp3xxx_alarm_irq_enable(struct device *dev, unsigned int enabled) return 0; } -static int stmp3xxx_update_irq_enable(struct device *dev, unsigned int enabled) -{ - struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev); - - if (enabled) - stmp3xxx_setl(BM_RTC_CTRL_ONEMSEC_IRQ_EN, - rtc_data->io + HW_RTC_CTRL); - else - stmp3xxx_clearl(BM_RTC_CTRL_ONEMSEC_IRQ_EN, - rtc_data->io + HW_RTC_CTRL); - return 0; -} - static int stmp3xxx_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm) { struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev); @@ -149,8 +136,6 @@ static int stmp3xxx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm) static struct rtc_class_ops stmp3xxx_rtc_ops = { .alarm_irq_enable = stmp3xxx_alarm_irq_enable, - .update_irq_enable = - stmp3xxx_update_irq_enable, .read_time = stmp3xxx_rtc_gettime, .set_mmss = stmp3xxx_rtc_set_mmss, .read_alarm = stmp3xxx_rtc_read_alarm, diff --git a/drivers/rtc/rtc-twl.c b/drivers/rtc/rtc-twl.c index ed1b868..f9a2799 100644 --- a/drivers/rtc/rtc-twl.c +++ b/drivers/rtc/rtc-twl.c @@ -213,18 +213,6 @@ static int twl_rtc_alarm_irq_enable(struct device *dev, unsigned enabled) return ret; } -static int twl_rtc_update_irq_enable(struct device *dev, unsigned enabled) -{ - int ret; - - if (enabled) - ret = set_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_TIMER_M); - else - ret = mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_TIMER_M); - - return ret; -} - /* * Gets current TWL RTC time and date parameters. * @@ -433,7 +421,6 @@ static struct rtc_class_ops twl_rtc_ops = { .read_alarm = twl_rtc_read_alarm, .set_alarm = twl_rtc_set_alarm, .alarm_irq_enable = twl_rtc_alarm_irq_enable, - .update_irq_enable = twl_rtc_update_irq_enable, }; /*----------------------------------------------------------------------*/ diff --git a/drivers/rtc/rtc-wm831x.c b/drivers/rtc/rtc-wm831x.c index 82931dc..bdc909b 100644 --- a/drivers/rtc/rtc-wm831x.c +++ b/drivers/rtc/rtc-wm831x.c @@ -315,21 +315,6 @@ static int wm831x_rtc_alarm_irq_enable(struct device *dev, return wm831x_rtc_stop_alarm(wm831x_rtc); } -static int wm831x_rtc_update_irq_enable(struct device *dev, - unsigned int enabled) -{ - struct wm831x_rtc *wm831x_rtc = dev_get_drvdata(dev); - int val; - - if (enabled) - val = 1 << WM831X_RTC_PINT_FREQ_SHIFT; - else - val = 0; - - return wm831x_set_bits(wm831x_rtc->wm831x, WM831X_RTC_CONTROL, - WM831X_RTC_PINT_FREQ_MASK, val); -} - static irqreturn_t wm831x_alm_irq(int irq, void *data) { struct wm831x_rtc *wm831x_rtc = data; @@ -354,7 +339,6 @@ static const struct rtc_class_ops wm831x_rtc_ops = { .read_alarm = wm831x_rtc_readalarm, .set_alarm = wm831x_rtc_setalarm, .alarm_irq_enable = wm831x_rtc_alarm_irq_enable, - .update_irq_enable = wm831x_rtc_update_irq_enable, }; #ifdef CONFIG_PM diff --git a/drivers/rtc/rtc-wm8350.c b/drivers/rtc/rtc-wm8350.c index 3d0dc76..6642142 100644 --- a/drivers/rtc/rtc-wm8350.c +++ b/drivers/rtc/rtc-wm8350.c @@ -302,26 +302,6 @@ static int wm8350_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) return ret; } -static int wm8350_rtc_update_irq_enable(struct device *dev, - unsigned int enabled) -{ - struct wm8350 *wm8350 = dev_get_drvdata(dev); - - /* Suppress duplicate changes since genirq nests enable and - * disable calls. */ - if (enabled == wm8350->rtc.update_enabled) - return 0; - - if (enabled) - wm8350_unmask_irq(wm8350, WM8350_IRQ_RTC_SEC); - else - wm8350_mask_irq(wm8350, WM8350_IRQ_RTC_SEC); - - wm8350->rtc.update_enabled = enabled; - - return 0; -} - static irqreturn_t wm8350_rtc_alarm_handler(int irq, void *data) { struct wm8350 *wm8350 = data; @@ -357,7 +337,6 @@ static const struct rtc_class_ops wm8350_rtc_ops = { .read_alarm = wm8350_rtc_readalarm, .set_alarm = wm8350_rtc_setalarm, .alarm_irq_enable = wm8350_rtc_alarm_irq_enable, - .update_irq_enable = wm8350_rtc_update_irq_enable, }; #ifdef CONFIG_PM diff --git a/include/linux/rtc.h b/include/linux/rtc.h index 5eb9650..a69249d 100644 --- a/include/linux/rtc.h +++ b/include/linux/rtc.h @@ -149,7 +149,6 @@ struct rtc_class_ops { int (*set_mmss)(struct device *, unsigned long secs); int (*read_callback)(struct device *, int data); int (*alarm_irq_enable)(struct device *, unsigned int enabled); - int (*update_irq_enable)(struct device *, unsigned int enabled); }; #define RTC_DEVICE_NAME_SIZE 20 -- 1.7.3.2.146.gca209 ^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH 04/10] RTC: Cleanup rtc_class_ops->read_alarm() 2011-02-21 23:55 [PATCH 00/10] [RFC] RTC: Cleanups for 2.6.39 John Stultz ` (2 preceding siblings ...) 2011-02-21 23:55 ` [PATCH 03/10] RTC: Cleanup rtc_class_ops->update_irq_enable() John Stultz @ 2011-02-21 23:55 ` John Stultz 2011-02-22 2:34 ` [rtc-linux] " Mark Brown 2011-02-21 23:55 ` [PATCH 05/10] RTC: Clean out UIE icotl implementations John Stultz ` (5 subsequent siblings) 9 siblings, 1 reply; 32+ messages in thread From: John Stultz @ 2011-02-21 23:55 UTC (permalink / raw) To: LKML Cc: John Stultz, Thomas Gleixner, Alessandro Zummo, Marcelo Roberto Jimenez, rtc-linux With the generic rtc code managing the now virtualized alarm timer, no one actually calls rtc_clas_ops->read_alarm(). We do check that it exists in rtc_read_alarm(), but that is only to verify that the hardware supports irqs. The same test can be done by checking set_alarm instead. This patch changes the the read_alarm check to set_alarm, and then removes the read_alarm method and its implementations in the rt drivers. NOTE: I'm not 100% sure we won't later use this functionality from the generic layer, so this patch should only go in after some additional thought and discussion. CC: Thomas Gleixner <tglx@linutronix.de> CC: Alessandro Zummo <a.zummo@towertech.it> CC: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br> CC: rtc-linux@googlegroups.com Signed-off-by: John Stultz <john.stultz@linaro.org> --- drivers/rtc/interface.c | 3 +- drivers/rtc/rtc-ab3100.c | 34 ------------------- drivers/rtc/rtc-ab8500.c | 40 ----------------------- drivers/rtc/rtc-at32ap700x.c | 14 -------- drivers/rtc/rtc-at91rm9200.c | 22 ------------ drivers/rtc/rtc-at91sam9.c | 27 --------------- drivers/rtc/rtc-bfin.c | 11 ------ drivers/rtc/rtc-cmos.c | 73 ------------------------------------------ drivers/rtc/rtc-coh901331.c | 14 -------- drivers/rtc/rtc-davinci.c | 38 ---------------------- drivers/rtc/rtc-ds1286.c | 24 -------------- drivers/rtc/rtc-ds1305.c | 62 +----------------------------------- drivers/rtc/rtc-ds1307.c | 52 ------------------------------ drivers/rtc/rtc-ds1374.c | 43 ------------------------ drivers/rtc/rtc-ds1511.c | 18 ---------- drivers/rtc/rtc-ds1553.c | 16 --------- drivers/rtc/rtc-ds3232.c | 48 --------------------------- drivers/rtc/rtc-efi.c | 20 ----------- drivers/rtc/rtc-fm3130.c | 59 ---------------------------------- drivers/rtc/rtc-imxdi.c | 27 --------------- drivers/rtc/rtc-isl1208.c | 40 ----------------------- drivers/rtc/rtc-jz4740.c | 19 ----------- drivers/rtc/rtc-lpc32xx.c | 14 -------- drivers/rtc/rtc-m41t80.c | 50 ---------------------------- drivers/rtc/rtc-m48t59.c | 48 --------------------------- drivers/rtc/rtc-max8925.c | 31 ------------------ drivers/rtc/rtc-max8998.c | 32 ------------------ drivers/rtc/rtc-mc13xxx.c | 43 ------------------------ drivers/rtc/rtc-mpc5121.c | 13 ------- drivers/rtc/rtc-mrst.c | 32 ------------------ drivers/rtc/rtc-mv.c | 38 ---------------------- drivers/rtc/rtc-mxc.c | 18 ---------- drivers/rtc/rtc-nuc900.c | 12 ------- drivers/rtc/rtc-omap.c | 22 ------------ drivers/rtc/rtc-pcap.c | 21 ------------ drivers/rtc/rtc-pcf50633.c | 24 -------------- drivers/rtc/rtc-pl030.c | 9 ----- drivers/rtc/rtc-pl031.c | 29 ---------------- drivers/rtc/rtc-pxa.c | 16 --------- drivers/rtc/rtc-rs5c372.c | 38 ---------------------- drivers/rtc/rtc-rx8025.c | 46 -------------------------- drivers/rtc/rtc-s3c.c | 61 ----------------------------------- drivers/rtc/rtc-sa1100.c | 12 ------- drivers/rtc/rtc-sh.c | 40 ----------------------- drivers/rtc/rtc-stk17ta8.c | 16 --------- drivers/rtc/rtc-stmp3xxx.c | 9 ----- drivers/rtc/rtc-test.c | 7 ---- drivers/rtc/rtc-twl.c | 31 ------------------ drivers/rtc/rtc-tx4939.c | 30 ----------------- drivers/rtc/rtc-vr41xx.c | 20 ----------- drivers/rtc/rtc-wm831x.c | 36 -------------------- drivers/rtc/rtc-wm8350.c | 50 ---------------------------- drivers/rtc/rtc-x1205.c | 26 --------------- include/linux/rtc.h | 1 - 54 files changed, 3 insertions(+), 1576 deletions(-) diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c index cb2f072..14a43f5 100644 --- a/drivers/rtc/interface.c +++ b/drivers/rtc/interface.c @@ -125,7 +125,8 @@ int rtc_read_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm) return err; if (rtc->ops == NULL) err = -ENODEV; - else if (!rtc->ops->read_alarm) + /* Here we check set_alarm to make sure irq support exists */ + else if (!rtc->ops->set_alarm) err = -EINVAL; else { memset(alarm, 0, sizeof(struct rtc_wkalrm)); diff --git a/drivers/rtc/rtc-ab3100.c b/drivers/rtc/rtc-ab3100.c index 261a07e..603e90b 100644 --- a/drivers/rtc/rtc-ab3100.c +++ b/drivers/rtc/rtc-ab3100.c @@ -110,39 +110,6 @@ static int ab3100_rtc_read_time(struct device *dev, struct rtc_time *tm) return rtc_valid_tm(tm); } -static int ab3100_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) -{ - unsigned long time; - u64 fat_time; - u8 buf[6]; - u8 rtcval; - int err; - - /* Figure out if alarm is enabled or not */ - err = abx500_get_register_interruptible(dev, 0, - AB3100_RTC, &rtcval); - if (err) - return err; - if (rtcval & 0x04) - alarm->enabled = 1; - else - alarm->enabled = 0; - /* No idea how this could be represented */ - alarm->pending = 0; - /* Read out alarm registers, only 4 bytes */ - err = abx500_get_register_page_interruptible(dev, 0, - AB3100_AL0, buf, 4); - if (err) - return err; - fat_time = ((u64) buf[3] << 40) | ((u64) buf[2] << 32) | - ((u64) buf[1] << 24) | ((u64) buf[0] << 16); - time = (unsigned long) (fat_time / (u64) (AB3100_RTC_CLOCK_RATE * 2)); - - rtc_time_to_tm(time, &alarm->time); - - return rtc_valid_tm(&alarm->time); -} - static int ab3100_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) { u8 regs[] = {AB3100_AL0, AB3100_AL1, AB3100_AL2, AB3100_AL3}; @@ -194,7 +161,6 @@ static int ab3100_rtc_irq_enable(struct device *dev, unsigned int enabled) static const struct rtc_class_ops ab3100_rtc_ops = { .read_time = ab3100_rtc_read_time, .set_mmss = ab3100_rtc_set_mmss, - .read_alarm = ab3100_rtc_read_alarm, .set_alarm = ab3100_rtc_set_alarm, .alarm_irq_enable = ab3100_rtc_irq_enable, }; diff --git a/drivers/rtc/rtc-ab8500.c b/drivers/rtc/rtc-ab8500.c index e346705..67fea89 100644 --- a/drivers/rtc/rtc-ab8500.c +++ b/drivers/rtc/rtc-ab8500.c @@ -174,45 +174,6 @@ static int ab8500_rtc_set_time(struct device *dev, struct rtc_time *tm) AB8500_RTC_READ_REQ_REG, RTC_WRITE_REQUEST); } -static int ab8500_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) -{ - int retval, i; - u8 rtc_ctrl, value; - unsigned char buf[ARRAY_SIZE(ab8500_rtc_alarm_regs)]; - unsigned long secs, mins; - - /* Check if the alarm is enabled or not */ - retval = abx500_get_register_interruptible(dev, AB8500_RTC, - AB8500_RTC_STAT_REG, &rtc_ctrl); - if (retval < 0) - return retval; - - if (rtc_ctrl & RTC_ALARM_ENA) - alarm->enabled = 1; - else - alarm->enabled = 0; - - alarm->pending = 0; - - for (i = 0; i < ARRAY_SIZE(ab8500_rtc_alarm_regs); i++) { - retval = abx500_get_register_interruptible(dev, AB8500_RTC, - ab8500_rtc_alarm_regs[i], &value); - if (retval < 0) - return retval; - buf[i] = value; - } - - mins = (buf[0] << 16) | (buf[1] << 8) | (buf[2]); - secs = mins * 60; - - /* Add back the initially subtracted number of seconds */ - secs += get_elapsed_seconds(AB8500_RTC_EPOCH); - - rtc_time_to_tm(secs, &alarm->time); - - return rtc_valid_tm(&alarm->time); -} - static int ab8500_rtc_irq_enable(struct device *dev, unsigned int enabled) { return abx500_mask_and_set_register_interruptible(dev, AB8500_RTC, @@ -272,7 +233,6 @@ static irqreturn_t rtc_alarm_handler(int irq, void *data) static const struct rtc_class_ops ab8500_rtc_ops = { .read_time = ab8500_rtc_read_time, .set_time = ab8500_rtc_set_time, - .read_alarm = ab8500_rtc_read_alarm, .set_alarm = ab8500_rtc_set_alarm, .alarm_irq_enable = ab8500_rtc_irq_enable, }; diff --git a/drivers/rtc/rtc-at32ap700x.c b/drivers/rtc/rtc-at32ap700x.c index e725d51..6f6863d 100644 --- a/drivers/rtc/rtc-at32ap700x.c +++ b/drivers/rtc/rtc-at32ap700x.c @@ -91,19 +91,6 @@ static int at32_rtc_settime(struct device *dev, struct rtc_time *tm) return ret; } -static int at32_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm) -{ - struct rtc_at32ap700x *rtc = dev_get_drvdata(dev); - - spin_lock_irq(&rtc->lock); - rtc_time_to_tm(rtc->alarm_time, &alrm->time); - alrm->enabled = rtc_readl(rtc, IMR) & RTC_BIT(IMR_TOPI) ? 1 : 0; - alrm->pending = rtc_readl(rtc, ISR) & RTC_BIT(ISR_TOPI) ? 1 : 0; - spin_unlock_irq(&rtc->lock); - - return 0; -} - static int at32_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) { struct rtc_at32ap700x *rtc = dev_get_drvdata(dev); @@ -190,7 +177,6 @@ static irqreturn_t at32_rtc_interrupt(int irq, void *dev_id) static struct rtc_class_ops at32_rtc_ops = { .read_time = at32_rtc_readtime, .set_time = at32_rtc_settime, - .read_alarm = at32_rtc_readalarm, .set_alarm = at32_rtc_setalarm, .alarm_irq_enable = at32_rtc_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-at91rm9200.c b/drivers/rtc/rtc-at91rm9200.c index 26d1cf5..30a48ac 100644 --- a/drivers/rtc/rtc-at91rm9200.c +++ b/drivers/rtc/rtc-at91rm9200.c @@ -125,27 +125,6 @@ static int at91_rtc_settime(struct device *dev, struct rtc_time *tm) } /* - * Read alarm time and date in RTC - */ -static int at91_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm) -{ - struct rtc_time *tm = &alrm->time; - - at91_rtc_decodetime(AT91_RTC_TIMALR, AT91_RTC_CALALR, tm); - tm->tm_yday = rtc_year_days(tm->tm_mday, tm->tm_mon, tm->tm_year); - tm->tm_year = at91_alarm_year - 1900; - - alrm->enabled = (at91_sys_read(AT91_RTC_IMR) & AT91_RTC_ALARM) - ? 1 : 0; - - pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __func__, - 1900 + tm->tm_year, tm->tm_mon, tm->tm_mday, - tm->tm_hour, tm->tm_min, tm->tm_sec); - - return 0; -} - -/* * Set alarm time and date in RTC */ static int at91_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) @@ -272,7 +251,6 @@ static const struct rtc_class_ops at91_rtc_ops = { .ioctl = at91_rtc_ioctl, .read_time = at91_rtc_readtime, .set_time = at91_rtc_settime, - .read_alarm = at91_rtc_readalarm, .set_alarm = at91_rtc_setalarm, .proc = at91_rtc_proc, .alarm_irq_enable = at91_rtc_alarm_irq_enable, diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c index c36749e..8d954bf 100644 --- a/drivers/rtc/rtc-at91sam9.c +++ b/drivers/rtc/rtc-at91sam9.c @@ -151,32 +151,6 @@ static int at91_rtc_settime(struct device *dev, struct rtc_time *tm) return 0; } -static int at91_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm) -{ - struct sam9_rtc *rtc = dev_get_drvdata(dev); - struct rtc_time *tm = &alrm->time; - u32 alarm = rtt_readl(rtc, AR); - u32 offset; - - offset = gpbr_readl(rtc); - if (offset == 0) - return -EILSEQ; - - memset(alrm, 0, sizeof(*alrm)); - if (alarm != ALARM_DISABLED && offset != 0) { - rtc_time_to_tm(offset + alarm, tm); - - dev_dbg(dev, "%s: %4d-%02d-%02d %02d:%02d:%02d\n", "readalarm", - 1900 + tm->tm_year, tm->tm_mon, tm->tm_mday, - tm->tm_hour, tm->tm_min, tm->tm_sec); - - if (rtt_readl(rtc, MR) & AT91_RTT_ALMIEN) - alrm->enabled = 1; - } - - return 0; -} - static int at91_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) { struct sam9_rtc *rtc = dev_get_drvdata(dev); @@ -306,7 +280,6 @@ static const struct rtc_class_ops at91_rtc_ops = { .ioctl = at91_rtc_ioctl, .read_time = at91_rtc_readtime, .set_time = at91_rtc_settime, - .read_alarm = at91_rtc_readalarm, .set_alarm = at91_rtc_setalarm, .proc = at91_rtc_proc, .alarm_irq_enabled = at91_rtc_alarm_irq_enable, diff --git a/drivers/rtc/rtc-bfin.c b/drivers/rtc/rtc-bfin.c index 17971d9..9b846e4 100644 --- a/drivers/rtc/rtc-bfin.c +++ b/drivers/rtc/rtc-bfin.c @@ -311,16 +311,6 @@ static int bfin_rtc_set_time(struct device *dev, struct rtc_time *tm) return ret; } -static int bfin_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) -{ - struct bfin_rtc *rtc = dev_get_drvdata(dev); - dev_dbg_stamp(dev); - alrm->time = rtc->rtc_alarm; - bfin_rtc_sync_pending(dev); - alrm->enabled = !!(bfin_read_RTC_ICTL() & (RTC_ISTAT_ALARM | RTC_ISTAT_ALARM_DAY)); - return 0; -} - static int bfin_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) { struct bfin_rtc *rtc = dev_get_drvdata(dev); @@ -361,7 +351,6 @@ static struct rtc_class_ops bfin_rtc_ops = { .ioctl = bfin_rtc_ioctl, .read_time = bfin_rtc_read_time, .set_time = bfin_rtc_set_time, - .read_alarm = bfin_rtc_read_alarm, .set_alarm = bfin_rtc_set_alarm, .proc = bfin_rtc_proc, .alarm_irq_enable = bfin_rtc_alarm_irq_enable, diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index dc2a0ba..281af32 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c @@ -203,78 +203,6 @@ static int cmos_set_time(struct device *dev, struct rtc_time *t) return set_rtc_time(t); } -static int cmos_read_alarm(struct device *dev, struct rtc_wkalrm *t) -{ - struct cmos_rtc *cmos = dev_get_drvdata(dev); - unsigned char rtc_control; - - if (!is_valid_irq(cmos->irq)) - return -EIO; - - /* Basic alarms only support hour, minute, and seconds fields. - * Some also support day and month, for alarms up to a year in - * the future. - */ - t->time.tm_mday = -1; - t->time.tm_mon = -1; - - spin_lock_irq(&rtc_lock); - t->time.tm_sec = CMOS_READ(RTC_SECONDS_ALARM); - t->time.tm_min = CMOS_READ(RTC_MINUTES_ALARM); - t->time.tm_hour = CMOS_READ(RTC_HOURS_ALARM); - - if (cmos->day_alrm) { - /* ignore upper bits on readback per ACPI spec */ - t->time.tm_mday = CMOS_READ(cmos->day_alrm) & 0x3f; - if (!t->time.tm_mday) - t->time.tm_mday = -1; - - if (cmos->mon_alrm) { - t->time.tm_mon = CMOS_READ(cmos->mon_alrm); - if (!t->time.tm_mon) - t->time.tm_mon = -1; - } - } - - rtc_control = CMOS_READ(RTC_CONTROL); - spin_unlock_irq(&rtc_lock); - - if (!(rtc_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) { - if (((unsigned)t->time.tm_sec) < 0x60) - t->time.tm_sec = bcd2bin(t->time.tm_sec); - else - t->time.tm_sec = -1; - if (((unsigned)t->time.tm_min) < 0x60) - t->time.tm_min = bcd2bin(t->time.tm_min); - else - t->time.tm_min = -1; - if (((unsigned)t->time.tm_hour) < 0x24) - t->time.tm_hour = bcd2bin(t->time.tm_hour); - else - t->time.tm_hour = -1; - - if (cmos->day_alrm) { - if (((unsigned)t->time.tm_mday) <= 0x31) - t->time.tm_mday = bcd2bin(t->time.tm_mday); - else - t->time.tm_mday = -1; - - if (cmos->mon_alrm) { - if (((unsigned)t->time.tm_mon) <= 0x12) - t->time.tm_mon = bcd2bin(t->time.tm_mon)-1; - else - t->time.tm_mon = -1; - } - } - } - t->time.tm_year = -1; - - t->enabled = !!(rtc_control & RTC_AIE); - t->pending = 0; - - return 0; -} - static void cmos_checkintr(struct cmos_rtc *cmos, unsigned char rtc_control) { unsigned char rtc_intr; @@ -435,7 +363,6 @@ static int cmos_procfs(struct device *dev, struct seq_file *seq) static const struct rtc_class_ops cmos_rtc_ops = { .read_time = cmos_read_time, .set_time = cmos_set_time, - .read_alarm = cmos_read_alarm, .set_alarm = cmos_set_alarm, .proc = cmos_procfs, .alarm_irq_enable = cmos_alarm_irq_enable, diff --git a/drivers/rtc/rtc-coh901331.c b/drivers/rtc/rtc-coh901331.c index 316f484..a631853 100644 --- a/drivers/rtc/rtc-coh901331.c +++ b/drivers/rtc/rtc-coh901331.c @@ -101,19 +101,6 @@ static int coh901331_set_mmss(struct device *dev, unsigned long secs) return 0; } -static int coh901331_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) -{ - struct coh901331_port *rtap = dev_get_drvdata(dev); - - clk_enable(rtap->clk); - rtc_time_to_tm(readl(rtap->virtbase + COH901331_ALARM), &alarm->time); - alarm->pending = readl(rtap->virtbase + COH901331_IRQ_EVENT) & 1U; - alarm->enabled = readl(rtap->virtbase + COH901331_IRQ_MASK) & 1U; - clk_disable(rtap->clk); - - return 0; -} - static int coh901331_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) { struct coh901331_port *rtap = dev_get_drvdata(dev); @@ -145,7 +132,6 @@ static int coh901331_alarm_irq_enable(struct device *dev, unsigned int enabled) static struct rtc_class_ops coh901331_ops = { .read_time = coh901331_read_time, .set_mmss = coh901331_set_mmss, - .read_alarm = coh901331_read_alarm, .set_alarm = coh901331_set_alarm, .alarm_irq_enable = coh901331_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-davinci.c b/drivers/rtc/rtc-davinci.c index dfd98a2..1fce4e0 100644 --- a/drivers/rtc/rtc-davinci.c +++ b/drivers/rtc/rtc-davinci.c @@ -387,43 +387,6 @@ static int davinci_rtc_alarm_irq_enable(struct device *dev, return 0; } -static int davinci_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm) -{ - struct davinci_rtc *davinci_rtc = dev_get_drvdata(dev); - u16 days = 0; - u8 day0, day1; - unsigned long flags; - - spin_lock_irqsave(&davinci_rtc_lock, flags); - - davinci_rtcss_calendar_wait(davinci_rtc); - alm->time.tm_min = bcd2bin(rtcss_read(davinci_rtc, PRTCSS_RTC_AMIN)); - - davinci_rtcss_calendar_wait(davinci_rtc); - alm->time.tm_hour = bcd2bin(rtcss_read(davinci_rtc, PRTCSS_RTC_AHOUR)); - - davinci_rtcss_calendar_wait(davinci_rtc); - day0 = rtcss_read(davinci_rtc, PRTCSS_RTC_ADAY0); - - davinci_rtcss_calendar_wait(davinci_rtc); - day1 = rtcss_read(davinci_rtc, PRTCSS_RTC_ADAY1); - - spin_unlock_irqrestore(&davinci_rtc_lock, flags); - days |= day1; - days <<= 8; - days |= day0; - - if (convertfromdays(days, &alm->time) < 0) - return -EINVAL; - - alm->pending = !!(rtcss_read(davinci_rtc, - PRTCSS_RTC_CCTRL) & - PRTCSS_RTC_CCTRL_AIEN); - alm->enabled = alm->pending && device_may_wakeup(dev); - - return 0; -} - static int davinci_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm) { struct davinci_rtc *davinci_rtc = dev_get_drvdata(dev); @@ -478,7 +441,6 @@ static struct rtc_class_ops davinci_rtc_ops = { .read_time = davinci_rtc_read_time, .set_time = davinci_rtc_set_time, .alarm_irq_enable = davinci_rtc_alarm_irq_enable, - .read_alarm = davinci_rtc_read_alarm, .set_alarm = davinci_rtc_set_alarm, }; diff --git a/drivers/rtc/rtc-ds1286.c b/drivers/rtc/rtc-ds1286.c index 60ce696..4646417 100644 --- a/drivers/rtc/rtc-ds1286.c +++ b/drivers/rtc/rtc-ds1286.c @@ -267,29 +267,6 @@ static int ds1286_set_time(struct device *dev, struct rtc_time *tm) return 0; } -static int ds1286_read_alarm(struct device *dev, struct rtc_wkalrm *alm) -{ - struct ds1286_priv *priv = dev_get_drvdata(dev); - unsigned char cmd; - unsigned long flags; - - /* - * Only the values that we read from the RTC are set. That - * means only tm_wday, tm_hour, tm_min. - */ - spin_lock_irqsave(&priv->lock, flags); - alm->time.tm_min = ds1286_rtc_read(priv, RTC_MINUTES_ALARM) & 0x7f; - alm->time.tm_hour = ds1286_rtc_read(priv, RTC_HOURS_ALARM) & 0x1f; - alm->time.tm_wday = ds1286_rtc_read(priv, RTC_DAY_ALARM) & 0x07; - cmd = ds1286_rtc_read(priv, RTC_CMD); - spin_unlock_irqrestore(&priv->lock, flags); - - alm->time.tm_min = bcd2bin(alm->time.tm_min); - alm->time.tm_hour = bcd2bin(alm->time.tm_hour); - alm->time.tm_sec = 0; - return 0; -} - static int ds1286_set_alarm(struct device *dev, struct rtc_wkalrm *alm) { struct ds1286_priv *priv = dev_get_drvdata(dev); @@ -324,7 +301,6 @@ static const struct rtc_class_ops ds1286_ops = { .proc = ds1286_proc, .read_time = ds1286_read_time, .set_time = ds1286_set_time, - .read_alarm = ds1286_read_alarm, .set_alarm = ds1286_set_alarm, .alarm_irq_enable = ds1286_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-ds1305.c b/drivers/rtc/rtc-ds1305.c index 57fbcc1..8189b1b 100644 --- a/drivers/rtc/rtc-ds1305.c +++ b/drivers/rtc/rtc-ds1305.c @@ -241,7 +241,7 @@ static int ds1305_set_time(struct device *dev, struct rtc_time *time) } /* - * Get/set of alarm is a bit funky: + * Set of alarm is a bit funky: * * - First there's the inherent raciness of getting the (partitioned) * status of an alarm that could trigger while we're reading parts @@ -271,65 +271,6 @@ static int ds1305_set_time(struct device *dev, struct rtc_time *time) /* * Context: caller holds rtc->ops_lock (to protect ds1305->ctrl) */ -static int ds1305_get_alarm(struct device *dev, struct rtc_wkalrm *alm) -{ - struct ds1305 *ds1305 = dev_get_drvdata(dev); - struct spi_device *spi = ds1305->spi; - u8 addr; - int status; - u8 buf[DS1305_ALM_LEN]; - - /* Refresh control register cache BEFORE reading ALM0 registers, - * since reading alarm registers acks any pending IRQ. That - * makes returning "pending" status a bit of a lie, but that bit - * of EFI status is at best fragile anyway (given IRQ handlers). - */ - addr = DS1305_CONTROL; - status = spi_write_then_read(spi, &addr, sizeof addr, - ds1305->ctrl, sizeof ds1305->ctrl); - if (status < 0) - return status; - - alm->enabled = !!(ds1305->ctrl[0] & DS1305_AEI0); - alm->pending = !!(ds1305->ctrl[1] & DS1305_AEI0); - - /* get and check ALM0 registers */ - addr = DS1305_ALM0(DS1305_SEC); - status = spi_write_then_read(spi, &addr, sizeof addr, - buf, sizeof buf); - if (status < 0) - return status; - - dev_vdbg(dev, "%s: %02x %02x %02x %02x\n", - "alm0 read", buf[DS1305_SEC], buf[DS1305_MIN], - buf[DS1305_HOUR], buf[DS1305_WDAY]); - - if ((DS1305_ALM_DISABLE & buf[DS1305_SEC]) - || (DS1305_ALM_DISABLE & buf[DS1305_MIN]) - || (DS1305_ALM_DISABLE & buf[DS1305_HOUR])) - return -EIO; - - /* Stuff these values into alm->time and let RTC framework code - * fill in the rest ... and also handle rollover to tomorrow when - * that's needed. - */ - alm->time.tm_sec = bcd2bin(buf[DS1305_SEC]); - alm->time.tm_min = bcd2bin(buf[DS1305_MIN]); - alm->time.tm_hour = bcd2hour(buf[DS1305_HOUR]); - alm->time.tm_mday = -1; - alm->time.tm_mon = -1; - alm->time.tm_year = -1; - /* next three fields are unused by Linux */ - alm->time.tm_wday = -1; - alm->time.tm_mday = -1; - alm->time.tm_isdst = -1; - - return 0; -} - -/* - * Context: caller holds rtc->ops_lock (to protect ds1305->ctrl) - */ static int ds1305_set_alarm(struct device *dev, struct rtc_wkalrm *alm) { struct ds1305 *ds1305 = dev_get_drvdata(dev); @@ -445,7 +386,6 @@ done: static const struct rtc_class_ops ds1305_ops = { .read_time = ds1305_get_time, .set_time = ds1305_set_time, - .read_alarm = ds1305_get_alarm, .set_alarm = ds1305_set_alarm, .proc = ds1305_proc, .alarm_irq_enable = ds1305_alarm_irq_enable, diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c index 4724ba3..798cb1d 100644 --- a/drivers/rtc/rtc-ds1307.c +++ b/drivers/rtc/rtc-ds1307.c @@ -381,57 +381,6 @@ static int ds1307_set_time(struct device *dev, struct rtc_time *t) return 0; } -static int ds1337_read_alarm(struct device *dev, struct rtc_wkalrm *t) -{ - struct i2c_client *client = to_i2c_client(dev); - struct ds1307 *ds1307 = i2c_get_clientdata(client); - int ret; - - if (!test_bit(HAS_ALARM, &ds1307->flags)) - return -EINVAL; - - /* read all ALARM1, ALARM2, and status registers at once */ - ret = ds1307->read_block_data(client, - DS1339_REG_ALARM1_SECS, 9, ds1307->regs); - if (ret != 9) { - dev_err(dev, "%s error %d\n", "alarm read", ret); - return -EIO; - } - - dev_dbg(dev, "%s: %02x %02x %02x %02x, %02x %02x %02x, %02x %02x\n", - "alarm read", - ds1307->regs[0], ds1307->regs[1], - ds1307->regs[2], ds1307->regs[3], - ds1307->regs[4], ds1307->regs[5], - ds1307->regs[6], ds1307->regs[7], - ds1307->regs[8]); - - /* report alarm time (ALARM1); assume 24 hour and day-of-month modes, - * and that all four fields are checked matches - */ - t->time.tm_sec = bcd2bin(ds1307->regs[0] & 0x7f); - t->time.tm_min = bcd2bin(ds1307->regs[1] & 0x7f); - t->time.tm_hour = bcd2bin(ds1307->regs[2] & 0x3f); - t->time.tm_mday = bcd2bin(ds1307->regs[3] & 0x3f); - t->time.tm_mon = -1; - t->time.tm_year = -1; - t->time.tm_wday = -1; - t->time.tm_yday = -1; - t->time.tm_isdst = -1; - - /* ... and status */ - t->enabled = !!(ds1307->regs[7] & DS1337_BIT_A1IE); - t->pending = !!(ds1307->regs[8] & DS1337_BIT_A1I); - - dev_dbg(dev, "%s secs=%d, mins=%d, " - "hours=%d, mday=%d, enabled=%d, pending=%d\n", - "alarm read", t->time.tm_sec, t->time.tm_min, - t->time.tm_hour, t->time.tm_mday, - t->enabled, t->pending); - - return 0; -} - static int ds1337_set_alarm(struct device *dev, struct rtc_wkalrm *t) { struct i2c_client *client = to_i2c_client(dev); @@ -523,7 +472,6 @@ static int ds1307_alarm_irq_enable(struct device *dev, unsigned int enabled) static const struct rtc_class_ops ds13xx_rtc_ops = { .read_time = ds1307_get_time, .set_time = ds1307_set_time, - .read_alarm = ds1337_read_alarm, .set_alarm = ds1337_set_alarm, .alarm_irq_enable = ds1307_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c index d834a63..976a795 100644 --- a/drivers/rtc/rtc-ds1374.c +++ b/drivers/rtc/rtc-ds1374.c @@ -162,48 +162,6 @@ static int ds1374_set_time(struct device *dev, struct rtc_time *time) return ds1374_write_rtc(client, itime, DS1374_REG_TOD0, 4); } -/* The ds1374 has a decrementer for an alarm, rather than a comparator. - * If the time of day is changed, then the alarm will need to be - * reset. - */ -static int ds1374_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) -{ - struct i2c_client *client = to_i2c_client(dev); - struct ds1374 *ds1374 = i2c_get_clientdata(client); - u32 now, cur_alarm; - int cr, sr; - int ret = 0; - - if (client->irq <= 0) - return -EINVAL; - - mutex_lock(&ds1374->mutex); - - cr = ret = i2c_smbus_read_byte_data(client, DS1374_REG_CR); - if (ret < 0) - goto out; - - sr = ret = i2c_smbus_read_byte_data(client, DS1374_REG_SR); - if (ret < 0) - goto out; - - ret = ds1374_read_rtc(client, &now, DS1374_REG_TOD0, 4); - if (ret) - goto out; - - ret = ds1374_read_rtc(client, &cur_alarm, DS1374_REG_WDALM0, 3); - if (ret) - goto out; - - rtc_time_to_tm(now + cur_alarm, &alarm->time); - alarm->enabled = !!(cr & DS1374_REG_CR_WACE); - alarm->pending = !!(sr & DS1374_REG_SR_AF); - -out: - mutex_unlock(&ds1374->mutex); - return ret; -} - static int ds1374_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) { struct i2c_client *client = to_i2c_client(dev); @@ -335,7 +293,6 @@ out: static const struct rtc_class_ops ds1374_rtc_ops = { .read_time = ds1374_read_time, .set_time = ds1374_set_time, - .read_alarm = ds1374_read_alarm, .set_alarm = ds1374_set_alarm, .alarm_irq_enable = ds1374_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c index 3fffd70..98288a6 100644 --- a/drivers/rtc/rtc-ds1511.c +++ b/drivers/rtc/rtc-ds1511.c @@ -341,23 +341,6 @@ ds1511_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) return 0; } - static int -ds1511_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) -{ - struct platform_device *pdev = to_platform_device(dev); - struct rtc_plat_data *pdata = platform_get_drvdata(pdev); - - if (pdata->irq <= 0) - return -EINVAL; - - alrm->time.tm_mday = pdata->alrm_mday < 0 ? 0 : pdata->alrm_mday; - alrm->time.tm_hour = pdata->alrm_hour < 0 ? 0 : pdata->alrm_hour; - alrm->time.tm_min = pdata->alrm_min < 0 ? 0 : pdata->alrm_min; - alrm->time.tm_sec = pdata->alrm_sec < 0 ? 0 : pdata->alrm_sec; - alrm->enabled = (pdata->irqen & RTC_AF) ? 1 : 0; - return 0; -} - static irqreturn_t ds1511_interrupt(int irq, void *dev_id) { @@ -400,7 +383,6 @@ static int ds1511_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) static const struct rtc_class_ops ds1511_rtc_ops = { .read_time = ds1511_rtc_read_time, .set_time = ds1511_rtc_set_time, - .read_alarm = ds1511_rtc_read_alarm, .set_alarm = ds1511_rtc_set_alarm, .alarm_irq_enable = ds1511_rtc_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c index fee41b9..43d6763 100644 --- a/drivers/rtc/rtc-ds1553.c +++ b/drivers/rtc/rtc-ds1553.c @@ -175,21 +175,6 @@ static int ds1553_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) return 0; } -static int ds1553_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) -{ - struct platform_device *pdev = to_platform_device(dev); - struct rtc_plat_data *pdata = platform_get_drvdata(pdev); - - if (pdata->irq <= 0) - return -EINVAL; - alrm->time.tm_mday = pdata->alrm_mday < 0 ? 0 : pdata->alrm_mday; - alrm->time.tm_hour = pdata->alrm_hour < 0 ? 0 : pdata->alrm_hour; - alrm->time.tm_min = pdata->alrm_min < 0 ? 0 : pdata->alrm_min; - alrm->time.tm_sec = pdata->alrm_sec < 0 ? 0 : pdata->alrm_sec; - alrm->enabled = (pdata->irqen & RTC_AF) ? 1 : 0; - return 0; -} - static irqreturn_t ds1553_rtc_interrupt(int irq, void *dev_id) { struct platform_device *pdev = dev_id; @@ -230,7 +215,6 @@ static int ds1553_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) static const struct rtc_class_ops ds1553_rtc_ops = { .read_time = ds1553_rtc_read_time, .set_time = ds1553_rtc_set_time, - .read_alarm = ds1553_rtc_read_alarm, .set_alarm = ds1553_rtc_set_alarm, .alarm_irq_enable = ds1553_rtc_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-ds3232.c b/drivers/rtc/rtc-ds3232.c index 7608b1b..57c00b8 100644 --- a/drivers/rtc/rtc-ds3232.c +++ b/drivers/rtc/rtc-ds3232.c @@ -177,53 +177,6 @@ static int ds3232_set_time(struct device *dev, struct rtc_time *time) } /* - * DS3232 has two alarm, we only use alarm1 - * According to linux specification, only support one-shot alarm - * no periodic alarm mode - */ -static int ds3232_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) -{ - struct i2c_client *client = to_i2c_client(dev); - struct ds3232 *ds3232 = i2c_get_clientdata(client); - int control, stat; - int ret; - u8 buf[4]; - - mutex_lock(&ds3232->mutex); - - ret = i2c_smbus_read_byte_data(client, DS3232_REG_SR); - if (ret < 0) - goto out; - stat = ret; - ret = i2c_smbus_read_byte_data(client, DS3232_REG_CR); - if (ret < 0) - goto out; - control = ret; - ret = i2c_smbus_read_i2c_block_data(client, DS3232_REG_ALARM1, 4, buf); - if (ret < 0) - goto out; - - alarm->time.tm_sec = bcd2bin(buf[0] & 0x7F); - alarm->time.tm_min = bcd2bin(buf[1] & 0x7F); - alarm->time.tm_hour = bcd2bin(buf[2] & 0x7F); - alarm->time.tm_mday = bcd2bin(buf[3] & 0x7F); - - alarm->time.tm_mon = -1; - alarm->time.tm_year = -1; - alarm->time.tm_wday = -1; - alarm->time.tm_yday = -1; - alarm->time.tm_isdst = -1; - - alarm->enabled = !!(control & DS3232_REG_CR_A1IE); - alarm->pending = !!(stat & DS3232_REG_SR_A1F); - - ret = 0; -out: - mutex_unlock(&ds3232->mutex); - return ret; -} - -/* * linux rtc-module does not support wday alarm * and only 24h time mode supported indeed */ @@ -382,7 +335,6 @@ unlock: static const struct rtc_class_ops ds3232_rtc_ops = { .read_time = ds3232_read_time, .set_time = ds3232_set_time, - .read_alarm = ds3232_read_alarm, .set_alarm = ds3232_set_alarm, .alarm_irq_enable = ds3232_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-efi.c b/drivers/rtc/rtc-efi.c index 5502923..7c3c10b 100644 --- a/drivers/rtc/rtc-efi.c +++ b/drivers/rtc/rtc-efi.c @@ -106,25 +106,6 @@ convert_from_efi_time(efi_time_t *eft, struct rtc_time *wtime) } } -static int efi_read_alarm(struct device *dev, struct rtc_wkalrm *wkalrm) -{ - efi_time_t eft; - efi_status_t status; - - /* - * As of EFI v1.10, this call always returns an unsupported status - */ - status = efi.get_wakeup_time((efi_bool_t *)&wkalrm->enabled, - (efi_bool_t *)&wkalrm->pending, &eft); - - if (status != EFI_SUCCESS) - return -EINVAL; - - convert_from_efi_time(&eft, &wkalrm->time); - - return rtc_valid_tm(&wkalrm->time); -} - static int efi_set_alarm(struct device *dev, struct rtc_wkalrm *wkalrm) { efi_time_t eft; @@ -181,7 +162,6 @@ static int efi_set_time(struct device *dev, struct rtc_time *tm) static const struct rtc_class_ops efi_rtc_ops = { .read_time = efi_read_time, .set_time = efi_set_time, - .read_alarm = efi_read_alarm, .set_alarm = efi_set_alarm, }; diff --git a/drivers/rtc/rtc-fm3130.c b/drivers/rtc/rtc-fm3130.c index 4cf2e70..d3832e2 100644 --- a/drivers/rtc/rtc-fm3130.c +++ b/drivers/rtc/rtc-fm3130.c @@ -199,64 +199,6 @@ static int fm3130_set_time(struct device *dev, struct rtc_time *t) return 0; } -static int fm3130_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) -{ - struct fm3130 *fm3130 = dev_get_drvdata(dev); - int tmp; - struct rtc_time *tm = &alrm->time; - - if (!fm3130->alarm_valid) { - /* - * We have invalid alarm in RTC, probably due to battery faults - * or other problems. Return EIO for now, it will allow us to - * set alarm value later instead of error during probing which - * disables device - */ - return -EIO; - } - - /* read the RTC alarm registers all at once */ - tmp = i2c_transfer(to_i2c_adapter(fm3130->client->dev.parent), - &fm3130->msg[2], 2); - if (tmp != 2) { - dev_err(dev, "%s error %d\n", "read", tmp); - return -EIO; - } - dev_dbg(dev, "alarm read %02x %02x %02x %02x %02x\n", - fm3130->regs[FM3130_ALARM_SECONDS], - fm3130->regs[FM3130_ALARM_MINUTES], - fm3130->regs[FM3130_ALARM_HOURS], - fm3130->regs[FM3130_ALARM_DATE], - fm3130->regs[FM3130_ALARM_MONTHS]); - - tm->tm_sec = bcd2bin(fm3130->regs[FM3130_ALARM_SECONDS] & 0x7F); - tm->tm_min = bcd2bin(fm3130->regs[FM3130_ALARM_MINUTES] & 0x7F); - tm->tm_hour = bcd2bin(fm3130->regs[FM3130_ALARM_HOURS] & 0x3F); - tm->tm_mday = bcd2bin(fm3130->regs[FM3130_ALARM_DATE] & 0x3F); - tm->tm_mon = bcd2bin(fm3130->regs[FM3130_ALARM_MONTHS] & 0x1F); - - if (tm->tm_mon > 0) - tm->tm_mon -= 1; /* RTC is 1-12, tm_mon is 0-11 */ - - dev_dbg(dev, "%s secs=%d, mins=%d, " - "hours=%d, mday=%d, mon=%d, year=%d, wday=%d\n", - "read alarm", tm->tm_sec, tm->tm_min, - tm->tm_hour, tm->tm_mday, - tm->tm_mon, tm->tm_year, tm->tm_wday); - - /* check if alarm enabled */ - fm3130->regs[FM3130_RTC_CONTROL] = - i2c_smbus_read_byte_data(fm3130->client, FM3130_RTC_CONTROL); - - if ((fm3130->regs[FM3130_RTC_CONTROL] & FM3130_RTC_CONTROL_BIT_AEN) && - (~fm3130->regs[FM3130_RTC_CONTROL] & - FM3130_RTC_CONTROL_BIT_CAL)) { - alrm->enabled = 1; - } - - return 0; -} - static int fm3130_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) { struct fm3130 *fm3130 = dev_get_drvdata(dev); @@ -354,7 +296,6 @@ static int fm3130_alarm_irq_enable(struct device *dev, unsigned int enabled) static const struct rtc_class_ops fm3130_rtc_ops = { .read_time = fm3130_get_time, .set_time = fm3130_set_time, - .read_alarm = fm3130_read_alarm, .set_alarm = fm3130_set_alarm, .alarm_irq_enable = fm3130_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-imxdi.c b/drivers/rtc/rtc-imxdi.c index 2dd3c01..d4bb555 100644 --- a/drivers/rtc/rtc-imxdi.c +++ b/drivers/rtc/rtc-imxdi.c @@ -233,32 +233,6 @@ static int dryice_rtc_alarm_irq_enable(struct device *dev, } /* - * read the seconds portion of the alarm register. - * the fractional part of the alarm register is always zero. - */ -static int dryice_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) -{ - struct imxdi_dev *imxdi = dev_get_drvdata(dev); - u32 dcamr; - - dcamr = __raw_readl(imxdi->ioaddr + DCAMR); - rtc_time_to_tm(dcamr, &alarm->time); - - /* alarm is enabled if the interrupt is enabled */ - alarm->enabled = (__raw_readl(imxdi->ioaddr + DIER) & DIER_CAIE) != 0; - - /* don't allow the DSR read to mess up DSR_WCF */ - mutex_lock(&imxdi->write_mutex); - - /* alarm is pending if the alarm flag is set */ - alarm->pending = (__raw_readl(imxdi->ioaddr + DSR) & DSR_CAF) != 0; - - mutex_unlock(&imxdi->write_mutex); - - return 0; -} - -/* * set the seconds portion of dryice alarm register */ static int dryice_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) @@ -294,7 +268,6 @@ static struct rtc_class_ops dryice_rtc_ops = { .read_time = dryice_rtc_read_time, .set_mmss = dryice_rtc_set_mmss, .alarm_irq_enable = dryice_rtc_alarm_irq_enable, - .read_alarm = dryice_rtc_read_alarm, .set_alarm = dryice_rtc_set_alarm, }; diff --git a/drivers/rtc/rtc-isl1208.c b/drivers/rtc/rtc-isl1208.c index 468200c..53ad598 100644 --- a/drivers/rtc/rtc-isl1208.c +++ b/drivers/rtc/rtc-isl1208.c @@ -284,39 +284,6 @@ isl1208_i2c_read_time(struct i2c_client *client, struct rtc_time *tm) } static int -isl1208_i2c_read_alarm(struct i2c_client *client, struct rtc_wkalrm *alarm) -{ - struct rtc_time *const tm = &alarm->time; - u8 regs[ISL1208_ALARM_SECTION_LEN] = { 0, }; - int sr; - - sr = isl1208_i2c_get_sr(client); - if (sr < 0) { - dev_err(&client->dev, "%s: reading SR failed\n", __func__); - return sr; - } - - sr = isl1208_i2c_read_regs(client, ISL1208_REG_SCA, regs, - ISL1208_ALARM_SECTION_LEN); - if (sr < 0) { - dev_err(&client->dev, "%s: reading alarm section failed\n", - __func__); - return sr; - } - - /* MSB of each alarm register is an enable bit */ - tm->tm_sec = bcd2bin(regs[ISL1208_REG_SCA - ISL1208_REG_SCA] & 0x7f); - tm->tm_min = bcd2bin(regs[ISL1208_REG_MNA - ISL1208_REG_SCA] & 0x7f); - tm->tm_hour = bcd2bin(regs[ISL1208_REG_HRA - ISL1208_REG_SCA] & 0x3f); - tm->tm_mday = bcd2bin(regs[ISL1208_REG_DTA - ISL1208_REG_SCA] & 0x3f); - tm->tm_mon = - bcd2bin(regs[ISL1208_REG_MOA - ISL1208_REG_SCA] & 0x1f) - 1; - tm->tm_wday = bcd2bin(regs[ISL1208_REG_DWA - ISL1208_REG_SCA] & 0x03); - - return 0; -} - -static int isl1208_rtc_read_time(struct device *dev, struct rtc_time *tm) { return isl1208_i2c_read_time(to_i2c_client(dev), tm); @@ -385,17 +352,10 @@ isl1208_rtc_set_time(struct device *dev, struct rtc_time *tm) return isl1208_i2c_set_time(to_i2c_client(dev), tm); } -static int -isl1208_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) -{ - return isl1208_i2c_read_alarm(to_i2c_client(dev), alarm); -} - static const struct rtc_class_ops isl1208_rtc_ops = { .proc = isl1208_rtc_proc, .read_time = isl1208_rtc_read_time, .set_time = isl1208_rtc_set_time, - .read_alarm = isl1208_rtc_read_alarm, /*.set_alarm = isl1208_rtc_set_alarm, */ }; diff --git a/drivers/rtc/rtc-jz4740.c b/drivers/rtc/rtc-jz4740.c index b647363..37608e2 100644 --- a/drivers/rtc/rtc-jz4740.c +++ b/drivers/rtc/rtc-jz4740.c @@ -134,24 +134,6 @@ static int jz4740_rtc_set_mmss(struct device *dev, unsigned long secs) return jz4740_rtc_reg_write(rtc, JZ_REG_RTC_SEC, secs); } -static int jz4740_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) -{ - struct jz4740_rtc *rtc = dev_get_drvdata(dev); - uint32_t secs; - uint32_t ctrl; - - secs = jz4740_rtc_reg_read(rtc, JZ_REG_RTC_SEC_ALARM); - - ctrl = jz4740_rtc_reg_read(rtc, JZ_REG_RTC_CTRL); - - alrm->enabled = !!(ctrl & JZ_RTC_CTRL_AE); - alrm->pending = !!(ctrl & JZ_RTC_CTRL_AF); - - rtc_time_to_tm(secs, &alrm->time); - - return rtc_valid_tm(&alrm->time); -} - static int jz4740_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) { int ret; @@ -177,7 +159,6 @@ static int jz4740_rtc_alarm_irq_enable(struct device *dev, unsigned int enable) static struct rtc_class_ops jz4740_rtc_ops = { .read_time = jz4740_rtc_read_time, .set_mmss = jz4740_rtc_set_mmss, - .read_alarm = jz4740_rtc_read_alarm, .set_alarm = jz4740_rtc_set_alarm, .alarm_irq_enable = jz4740_rtc_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-lpc32xx.c b/drivers/rtc/rtc-lpc32xx.c index ec8701c..2ee02939 100644 --- a/drivers/rtc/rtc-lpc32xx.c +++ b/drivers/rtc/rtc-lpc32xx.c @@ -91,19 +91,6 @@ static int lpc32xx_rtc_set_mmss(struct device *dev, unsigned long secs) return 0; } -static int lpc32xx_rtc_read_alarm(struct device *dev, - struct rtc_wkalrm *wkalrm) -{ - struct lpc32xx_rtc *rtc = dev_get_drvdata(dev); - - rtc_time_to_tm(rtc_readl(rtc, LPC32XX_RTC_MATCH0), &wkalrm->time); - wkalrm->enabled = rtc->alarm_enabled; - wkalrm->pending = !!(rtc_readl(rtc, LPC32XX_RTC_INTSTAT) & - LPC32XX_RTC_INTSTAT_MATCH0); - - return rtc_valid_tm(&wkalrm->time); -} - static int lpc32xx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *wkalrm) { @@ -191,7 +178,6 @@ static irqreturn_t lpc32xx_rtc_alarm_interrupt(int irq, void *dev) static const struct rtc_class_ops lpc32xx_rtc_ops = { .read_time = lpc32xx_rtc_read_time, .set_mmss = lpc32xx_rtc_set_mmss, - .read_alarm = lpc32xx_rtc_read_alarm, .set_alarm = lpc32xx_rtc_set_alarm, .alarm_irq_enable = lpc32xx_rtc_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-m41t80.c b/drivers/rtc/rtc-m41t80.c index 69fe664..16b27ed 100644 --- a/drivers/rtc/rtc-m41t80.c +++ b/drivers/rtc/rtc-m41t80.c @@ -305,59 +305,9 @@ static int m41t80_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *t) return 0; } -static int m41t80_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *t) -{ - struct i2c_client *client = to_i2c_client(dev); - u8 buf[M41T80_ALARM_REG_SIZE + 1]; /* all alarm regs and flags */ - u8 dt_addr[1] = { M41T80_REG_ALARM_MON }; - u8 *reg = buf - M41T80_REG_ALARM_MON; - struct i2c_msg msgs[] = { - { - .addr = client->addr, - .flags = 0, - .len = 1, - .buf = dt_addr, - }, - { - .addr = client->addr, - .flags = I2C_M_RD, - .len = M41T80_ALARM_REG_SIZE + 1, - .buf = buf, - }, - }; - - if (i2c_transfer(client->adapter, msgs, 2) < 0) { - dev_err(&client->dev, "read error\n"); - return -EIO; - } - t->time.tm_sec = -1; - t->time.tm_min = -1; - t->time.tm_hour = -1; - t->time.tm_mday = -1; - t->time.tm_mon = -1; - if (!(reg[M41T80_REG_ALARM_SEC] & 0x80)) - t->time.tm_sec = bcd2bin(reg[M41T80_REG_ALARM_SEC] & 0x7f); - if (!(reg[M41T80_REG_ALARM_MIN] & 0x80)) - t->time.tm_min = bcd2bin(reg[M41T80_REG_ALARM_MIN] & 0x7f); - if (!(reg[M41T80_REG_ALARM_HOUR] & 0x80)) - t->time.tm_hour = bcd2bin(reg[M41T80_REG_ALARM_HOUR] & 0x3f); - if (!(reg[M41T80_REG_ALARM_DAY] & 0x80)) - t->time.tm_mday = bcd2bin(reg[M41T80_REG_ALARM_DAY] & 0x3f); - if (!(reg[M41T80_REG_ALARM_DAY] & 0x40)) - t->time.tm_mon = bcd2bin(reg[M41T80_REG_ALARM_MON] & 0x1f) - 1; - t->time.tm_year = -1; - t->time.tm_wday = -1; - t->time.tm_yday = -1; - t->time.tm_isdst = -1; - t->enabled = !!(reg[M41T80_REG_ALARM_MON] & M41T80_ALMON_AFE); - t->pending = !!(reg[M41T80_REG_FLAGS] & M41T80_FLAGS_AF); - return 0; -} - static struct rtc_class_ops m41t80_rtc_ops = { .read_time = m41t80_rtc_read_time, .set_time = m41t80_rtc_set_time, - .read_alarm = m41t80_rtc_read_alarm, .set_alarm = m41t80_rtc_set_alarm, .proc = m41t80_rtc_proc, .alarm_irq_enable = m41t80_rtc_alarm_irq_enable, diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c index 3978f4c..1b34c88 100644 --- a/drivers/rtc/rtc-m48t59.c +++ b/drivers/rtc/rtc-m48t59.c @@ -153,53 +153,6 @@ static int m48t59_rtc_set_time(struct device *dev, struct rtc_time *tm) } /* - * Read alarm time and date in RTC - */ -static int m48t59_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm) -{ - struct platform_device *pdev = to_platform_device(dev); - struct m48t59_plat_data *pdata = pdev->dev.platform_data; - struct m48t59_private *m48t59 = platform_get_drvdata(pdev); - struct rtc_time *tm = &alrm->time; - unsigned long flags; - u8 val; - - /* If no irq, we don't support ALARM */ - if (m48t59->irq == NO_IRQ) - return -EIO; - - spin_lock_irqsave(&m48t59->lock, flags); - /* Issue the READ command */ - M48T59_SET_BITS(M48T59_CNTL_READ, M48T59_CNTL); - - tm->tm_year = bcd2bin(M48T59_READ(M48T59_YEAR)); -#ifdef CONFIG_SPARC - /* Sun SPARC machines count years since 1968 */ - tm->tm_year += 68; -#endif - /* tm_mon is 0-11 */ - tm->tm_mon = bcd2bin(M48T59_READ(M48T59_MONTH)) - 1; - - val = M48T59_READ(M48T59_WDAY); - if ((val & M48T59_WDAY_CEB) && (val & M48T59_WDAY_CB)) - tm->tm_year += 100; /* one century */ - - tm->tm_mday = bcd2bin(M48T59_READ(M48T59_ALARM_DATE)); - tm->tm_hour = bcd2bin(M48T59_READ(M48T59_ALARM_HOUR)); - tm->tm_min = bcd2bin(M48T59_READ(M48T59_ALARM_MIN)); - tm->tm_sec = bcd2bin(M48T59_READ(M48T59_ALARM_SEC)); - - /* Clear the READ bit */ - M48T59_CLEAR_BITS(M48T59_CNTL_READ, M48T59_CNTL); - spin_unlock_irqrestore(&m48t59->lock, flags); - - dev_dbg(dev, "RTC read alarm time %04d-%02d-%02d %02d/%02d/%02d\n", - tm->tm_year + 1900, tm->tm_mon, tm->tm_mday, - tm->tm_hour, tm->tm_min, tm->tm_sec); - return rtc_valid_tm(tm); -} - -/* * Set alarm time and date in RTC */ static int m48t59_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) @@ -323,7 +276,6 @@ static irqreturn_t m48t59_rtc_interrupt(int irq, void *dev_id) static const struct rtc_class_ops m48t59_rtc_ops = { .read_time = m48t59_rtc_read_time, .set_time = m48t59_rtc_set_time, - .read_alarm = m48t59_rtc_readalarm, .set_alarm = m48t59_rtc_setalarm, .proc = m48t59_rtc_proc, .alarm_irq_enable = m48t59_rtc_alarm_irq_enable, diff --git a/drivers/rtc/rtc-max8925.c b/drivers/rtc/rtc-max8925.c index 174036d..4d18ea6 100644 --- a/drivers/rtc/rtc-max8925.c +++ b/drivers/rtc/rtc-max8925.c @@ -178,36 +178,6 @@ out: return ret; } -static int max8925_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) -{ - struct max8925_rtc_info *info = dev_get_drvdata(dev); - unsigned char buf[TIME_NUM]; - int ret; - - ret = max8925_bulk_read(info->rtc, MAX8925_ALARM0_SEC, TIME_NUM, buf); - if (ret < 0) - goto out; - ret = tm_calc(&alrm->time, buf, TIME_NUM); - if (ret < 0) - goto out; - ret = max8925_reg_read(info->rtc, MAX8925_RTC_IRQ_MASK); - if (ret < 0) - goto out; - if ((ret & ALARM0_IRQ) == 0) - alrm->enabled = 1; - else - alrm->enabled = 0; - ret = max8925_reg_read(info->rtc, MAX8925_RTC_STATUS); - if (ret < 0) - goto out; - if (ret & ALARM0_STATUS) - alrm->pending = 1; - else - alrm->pending = 0; -out: - return ret; -} - static int max8925_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) { struct max8925_rtc_info *info = dev_get_drvdata(dev); @@ -231,7 +201,6 @@ out: static const struct rtc_class_ops max8925_rtc_ops = { .read_time = max8925_rtc_read_time, .set_time = max8925_rtc_set_time, - .read_alarm = max8925_rtc_read_alarm, .set_alarm = max8925_rtc_set_alarm, }; diff --git a/drivers/rtc/rtc-max8998.c b/drivers/rtc/rtc-max8998.c index 3f7bc6b..a0a6bbf 100644 --- a/drivers/rtc/rtc-max8998.c +++ b/drivers/rtc/rtc-max8998.c @@ -138,37 +138,6 @@ static int max8998_rtc_set_time(struct device *dev, struct rtc_time *tm) return ret; } -static int max8998_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) -{ - struct max8998_rtc_info *info = dev_get_drvdata(dev); - u8 data[8]; - u8 val; - int ret; - - ret = max8998_bulk_read(info->rtc, MAX8998_ALARM0_SEC, 8, data); - if (ret < 0) - return ret; - - max8998_data_to_tm(data, &alrm->time); - - ret = max8998_read_reg(info->rtc, MAX8998_ALARM0_CONF, &val); - if (ret < 0) - return ret; - - alrm->enabled = !!val; - - ret = max8998_read_reg(info->rtc, MAX8998_RTC_STATUS, &val); - if (ret < 0) - return ret; - - if (val & ALARM0_STATUS) - alrm->pending = 1; - else - alrm->pending = 0; - - return 0; -} - static int max8998_rtc_stop_alarm(struct max8998_rtc_info *info) { int ret = max8998_write_reg(info->rtc, MAX8998_ALARM0_CONF, 0); @@ -244,7 +213,6 @@ static irqreturn_t max8998_rtc_alarm_irq(int irq, void *data) static const struct rtc_class_ops max8998_rtc_ops = { .read_time = max8998_rtc_read_time, .set_time = max8998_rtc_set_time, - .read_alarm = max8998_rtc_read_alarm, .set_alarm = max8998_rtc_set_alarm, .alarm_irq_enable = max8998_rtc_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-mc13xxx.c b/drivers/rtc/rtc-mc13xxx.c index c420064..974eaeb 100644 --- a/drivers/rtc/rtc-mc13xxx.c +++ b/drivers/rtc/rtc-mc13xxx.c @@ -167,48 +167,6 @@ out: return ret; } -static int mc13xxx_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) -{ - struct mc13xxx_rtc *priv = dev_get_drvdata(dev); - unsigned seconds, days; - unsigned long s1970; - int enabled, pending; - int ret; - - mc13xxx_lock(priv->mc13xxx); - - ret = mc13xxx_reg_read(priv->mc13xxx, MC13XXX_RTCTODA, &seconds); - if (unlikely(ret)) - goto out; - if (seconds >= 86400) { - ret = -ENODATA; - goto out; - } - - ret = mc13xxx_reg_read(priv->mc13xxx, MC13XXX_RTCDAY, &days); - if (unlikely(ret)) - goto out; - - ret = mc13xxx_irq_status(priv->mc13xxx, MC13XXX_IRQ_TODA, - &enabled, &pending); - -out: - mc13xxx_unlock(priv->mc13xxx); - - if (ret) - return ret; - - alarm->enabled = enabled; - alarm->pending = pending; - - s1970 = days * 86400 + seconds; - - rtc_time_to_tm(s1970, &alarm->time); - dev_dbg(dev, "%s: %lu\n", __func__, s1970); - - return 0; -} - static int mc13xxx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) { struct mc13xxx_rtc *priv = dev_get_drvdata(dev); @@ -291,7 +249,6 @@ static int mc13xxx_rtc_alarm_irq_enable(struct device *dev, static const struct rtc_class_ops mc13xxx_rtc_ops = { .read_time = mc13xxx_rtc_read_time, .set_mmss = mc13xxx_rtc_set_mmss, - .read_alarm = mc13xxx_rtc_read_alarm, .set_alarm = mc13xxx_rtc_set_alarm, .alarm_irq_enable = mc13xxx_rtc_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-mpc5121.c b/drivers/rtc/rtc-mpc5121.c index b40c1ff..7f2de4c 100644 --- a/drivers/rtc/rtc-mpc5121.c +++ b/drivers/rtc/rtc-mpc5121.c @@ -145,18 +145,6 @@ static int mpc5121_rtc_set_time(struct device *dev, struct rtc_time *tm) return 0; } -static int mpc5121_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) -{ - struct mpc5121_rtc_data *rtc = dev_get_drvdata(dev); - struct mpc5121_rtc_regs __iomem *regs = rtc->regs; - - *alarm = rtc->wkalarm; - - alarm->pending = in_8(®s->alm_status); - - return 0; -} - static int mpc5121_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) { struct mpc5121_rtc_data *rtc = dev_get_drvdata(dev); @@ -243,7 +231,6 @@ static int mpc5121_rtc_alarm_irq_enable(struct device *dev, static const struct rtc_class_ops mpc5121_rtc_ops = { .read_time = mpc5121_rtc_read_time, .set_time = mpc5121_rtc_set_time, - .read_alarm = mpc5121_rtc_read_alarm, .set_alarm = mpc5121_rtc_set_alarm, .alarm_irq_enable = mpc5121_rtc_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-mrst.c b/drivers/rtc/rtc-mrst.c index 4db96fa..e317d1e 100644 --- a/drivers/rtc/rtc-mrst.c +++ b/drivers/rtc/rtc-mrst.c @@ -127,37 +127,6 @@ static int mrst_set_time(struct device *dev, struct rtc_time *time) return ret; } -static int mrst_read_alarm(struct device *dev, struct rtc_wkalrm *t) -{ - struct mrst_rtc *mrst = dev_get_drvdata(dev); - unsigned char rtc_control; - - if (mrst->irq <= 0) - return -EIO; - - /* Basic alarms only support hour, minute, and seconds fields. - * Some also support day and month, for alarms up to a year in - * the future. - */ - t->time.tm_mday = -1; - t->time.tm_mon = -1; - t->time.tm_year = -1; - - /* vRTC only supports binary mode */ - spin_lock_irq(&rtc_lock); - t->time.tm_sec = vrtc_cmos_read(RTC_SECONDS_ALARM); - t->time.tm_min = vrtc_cmos_read(RTC_MINUTES_ALARM); - t->time.tm_hour = vrtc_cmos_read(RTC_HOURS_ALARM); - - rtc_control = vrtc_cmos_read(RTC_CONTROL); - spin_unlock_irq(&rtc_lock); - - t->enabled = !!(rtc_control & RTC_AIE); - t->pending = 0; - - return 0; -} - static void mrst_checkintr(struct mrst_rtc *mrst, unsigned char rtc_control) { unsigned char rtc_intr; @@ -279,7 +248,6 @@ static int mrst_procfs(struct device *dev, struct seq_file *seq) static const struct rtc_class_ops mrst_rtc_ops = { .read_time = mrst_read_time, .set_time = mrst_set_time, - .read_alarm = mrst_read_alarm, .set_alarm = mrst_set_alarm, .proc = mrst_procfs, .alarm_irq_enable = mrst_rtc_alarm_irq_enable, diff --git a/drivers/rtc/rtc-mv.c b/drivers/rtc/rtc-mv.c index 60627a7..e9acc8b 100644 --- a/drivers/rtc/rtc-mv.c +++ b/drivers/rtc/rtc-mv.c @@ -92,43 +92,6 @@ static int mv_rtc_read_time(struct device *dev, struct rtc_time *tm) return rtc_valid_tm(tm); } -static int mv_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm) -{ - struct rtc_plat_data *pdata = dev_get_drvdata(dev); - void __iomem *ioaddr = pdata->ioaddr; - u32 rtc_time, rtc_date; - unsigned int year, month, day, hour, minute, second, wday; - - rtc_time = readl(ioaddr + RTC_ALARM_TIME_REG_OFFS); - rtc_date = readl(ioaddr + RTC_ALARM_DATE_REG_OFFS); - - second = rtc_time & 0x7f; - minute = (rtc_time >> RTC_MINUTES_OFFS) & 0x7f; - hour = (rtc_time >> RTC_HOURS_OFFS) & 0x3f; /* assume 24 hours mode */ - wday = (rtc_time >> RTC_WDAY_OFFS) & 0x7; - - day = rtc_date & 0x3f; - month = (rtc_date >> RTC_MONTH_OFFS) & 0x3f; - year = (rtc_date >> RTC_YEAR_OFFS) & 0xff; - - alm->time.tm_sec = bcd2bin(second); - alm->time.tm_min = bcd2bin(minute); - alm->time.tm_hour = bcd2bin(hour); - alm->time.tm_mday = bcd2bin(day); - alm->time.tm_wday = bcd2bin(wday); - alm->time.tm_mon = bcd2bin(month) - 1; - /* hw counts from year 2000, but tm_year is relative to 1900 */ - alm->time.tm_year = bcd2bin(year) + 100; - - if (rtc_valid_tm(&alm->time) < 0) { - dev_err(dev, "retrieved alarm date/time is not valid.\n"); - rtc_time_to_tm(0, &alm->time); - } - - alm->enabled = !!readl(ioaddr + RTC_ALARM_INTERRUPT_MASK_REG_OFFS); - return 0; -} - static int mv_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm) { struct rtc_plat_data *pdata = dev_get_drvdata(dev); @@ -208,7 +171,6 @@ static const struct rtc_class_ops mv_rtc_ops = { static const struct rtc_class_ops mv_rtc_alarm_ops = { .read_time = mv_rtc_read_time, .set_time = mv_rtc_set_time, - .read_alarm = mv_rtc_read_alarm, .set_alarm = mv_rtc_set_alarm, .alarm_irq_enable = mv_rtc_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-mxc.c b/drivers/rtc/rtc-mxc.c index 826ab64..0c7fbff 100644 --- a/drivers/rtc/rtc-mxc.c +++ b/drivers/rtc/rtc-mxc.c @@ -305,23 +305,6 @@ static int mxc_rtc_set_mmss(struct device *dev, unsigned long time) } /* - * This function reads the current alarm value into the passed in 'alrm' - * argument. It updates the alrm's pending field value based on the whether - * an alarm interrupt occurs or not. - */ -static int mxc_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) -{ - struct platform_device *pdev = to_platform_device(dev); - struct rtc_plat_data *pdata = platform_get_drvdata(pdev); - void __iomem *ioaddr = pdata->ioaddr; - - rtc_time_to_tm(get_alarm_or_time(dev, MXC_RTC_ALARM), &alrm->time); - alrm->pending = ((readw(ioaddr + RTC_RTCISR) & RTC_ALM_BIT)) ? 1 : 0; - - return 0; -} - -/* * This function sets the RTC alarm based on passed in alrm. */ static int mxc_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) @@ -359,7 +342,6 @@ static struct rtc_class_ops mxc_rtc_ops = { .release = mxc_rtc_release, .read_time = mxc_rtc_read_time, .set_mmss = mxc_rtc_set_mmss, - .read_alarm = mxc_rtc_read_alarm, .set_alarm = mxc_rtc_set_alarm, .alarm_irq_enable = mxc_rtc_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-nuc900.c b/drivers/rtc/rtc-nuc900.c index 781068d..5aa7e3d 100644 --- a/drivers/rtc/rtc-nuc900.c +++ b/drivers/rtc/rtc-nuc900.c @@ -181,17 +181,6 @@ static int nuc900_rtc_set_time(struct device *dev, struct rtc_time *tm) return 0; } -static int nuc900_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) -{ - struct nuc900_rtc *rtc = dev_get_drvdata(dev); - unsigned int timeval, carval; - - timeval = __raw_readl(rtc->rtc_reg + REG_RTC_TAR); - carval = __raw_readl(rtc->rtc_reg + REG_RTC_CAR); - - return nuc900_rtc_bcd2bin(timeval, carval, &alrm->time); -} - static int nuc900_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) { struct nuc900_rtc *rtc = dev_get_drvdata(dev); @@ -217,7 +206,6 @@ static int nuc900_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) static struct rtc_class_ops nuc900_rtc_ops = { .read_time = nuc900_rtc_read_time, .set_time = nuc900_rtc_set_time, - .read_alarm = nuc900_rtc_read_alarm, .set_alarm = nuc900_rtc_set_alarm, .alarm_irq_enable = nuc900_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c index b4dbf3a..7e03835 100644 --- a/drivers/rtc/rtc-omap.c +++ b/drivers/rtc/rtc-omap.c @@ -262,27 +262,6 @@ static int omap_rtc_set_time(struct device *dev, struct rtc_time *tm) return 0; } -static int omap_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm) -{ - local_irq_disable(); - rtc_wait_not_busy(); - - alm->time.tm_sec = rtc_read(OMAP_RTC_ALARM_SECONDS_REG); - alm->time.tm_min = rtc_read(OMAP_RTC_ALARM_MINUTES_REG); - alm->time.tm_hour = rtc_read(OMAP_RTC_ALARM_HOURS_REG); - alm->time.tm_mday = rtc_read(OMAP_RTC_ALARM_DAYS_REG); - alm->time.tm_mon = rtc_read(OMAP_RTC_ALARM_MONTHS_REG); - alm->time.tm_year = rtc_read(OMAP_RTC_ALARM_YEARS_REG); - - local_irq_enable(); - - bcd2tm(&alm->time); - alm->enabled = !!(rtc_read(OMAP_RTC_INTERRUPTS_REG) - & OMAP_RTC_INTERRUPTS_IT_ALARM); - - return 0; -} - static int omap_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm) { u8 reg; @@ -316,7 +295,6 @@ static struct rtc_class_ops omap_rtc_ops = { .ioctl = omap_rtc_ioctl, .read_time = omap_rtc_read_time, .set_time = omap_rtc_set_time, - .read_alarm = omap_rtc_read_alarm, .set_alarm = omap_rtc_set_alarm, .alarm_irq_enable = omap_rtc_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-pcap.c b/drivers/rtc/rtc-pcap.c index a633abc..f91e20f 100644 --- a/drivers/rtc/rtc-pcap.c +++ b/drivers/rtc/rtc-pcap.c @@ -41,26 +41,6 @@ static irqreturn_t pcap_rtc_irq(int irq, void *_pcap_rtc) return IRQ_HANDLED; } -static int pcap_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) -{ - struct platform_device *pdev = to_platform_device(dev); - struct pcap_rtc *pcap_rtc = platform_get_drvdata(pdev); - struct rtc_time *tm = &alrm->time; - unsigned long secs; - u32 tod; /* time of day, seconds since midnight */ - u32 days; /* days since 1/1/1970 */ - - ezx_pcap_read(pcap_rtc->pcap, PCAP_REG_RTC_TODA, &tod); - secs = tod & PCAP_RTC_TOD_MASK; - - ezx_pcap_read(pcap_rtc->pcap, PCAP_REG_RTC_DAYA, &days); - secs += (days & PCAP_RTC_DAY_MASK) * SEC_PER_DAY; - - rtc_time_to_tm(secs, tm); - - return 0; -} - static int pcap_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) { struct platform_device *pdev = to_platform_device(dev); @@ -133,7 +113,6 @@ static int pcap_rtc_alarm_irq_enable(struct device *dev, unsigned int en) static const struct rtc_class_ops pcap_rtc_ops = { .read_time = pcap_rtc_read_time, - .read_alarm = pcap_rtc_read_alarm, .set_alarm = pcap_rtc_set_alarm, .set_mmss = pcap_rtc_set_mmss, .alarm_irq_enable = pcap_rtc_alarm_irq_enable, diff --git a/drivers/rtc/rtc-pcf50633.c b/drivers/rtc/rtc-pcf50633.c index f90c574..bbf90b8 100644 --- a/drivers/rtc/rtc-pcf50633.c +++ b/drivers/rtc/rtc-pcf50633.c @@ -183,29 +183,6 @@ static int pcf50633_rtc_set_time(struct device *dev, struct rtc_time *tm) return ret; } -static int pcf50633_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) -{ - struct pcf50633_rtc *rtc; - struct pcf50633_time pcf_tm; - int ret = 0; - - rtc = dev_get_drvdata(dev); - - alrm->enabled = rtc->alarm_enabled; - alrm->pending = rtc->alarm_pending; - - ret = pcf50633_read_block(rtc->pcf, PCF50633_REG_RTCSCA, - PCF50633_TI_EXTENT, &pcf_tm.time[0]); - if (ret != PCF50633_TI_EXTENT) { - dev_err(dev, "Failed to read time\n"); - return -EIO; - } - - pcf2rtc_time(&alrm->time, &pcf_tm); - - return rtc_valid_tm(&alrm->time); -} - static int pcf50633_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) { struct pcf50633_rtc *rtc; @@ -241,7 +218,6 @@ static int pcf50633_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) static struct rtc_class_ops pcf50633_rtc_ops = { .read_time = pcf50633_rtc_read_time, .set_time = pcf50633_rtc_set_time, - .read_alarm = pcf50633_rtc_read_alarm, .set_alarm = pcf50633_rtc_set_alarm, .alarm_irq_enable = pcf50633_rtc_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-pl030.c b/drivers/rtc/rtc-pl030.c index bbdb2f0..e7d982f 100644 --- a/drivers/rtc/rtc-pl030.c +++ b/drivers/rtc/rtc-pl030.c @@ -40,14 +40,6 @@ static int pl030_ioctl(struct device *dev, unsigned int cmd, unsigned long arg) return -ENOIOCTLCMD; } -static int pl030_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) -{ - struct pl030_rtc *rtc = dev_get_drvdata(dev); - - rtc_time_to_tm(readl(rtc->base + RTC_MR), &alrm->time); - return 0; -} - static int pl030_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) { struct pl030_rtc *rtc = dev_get_drvdata(dev); @@ -99,7 +91,6 @@ static const struct rtc_class_ops pl030_ops = { .ioctl = pl030_ioctl, .read_time = pl030_read_time, .set_time = pl030_set_time, - .read_alarm = pl030_read_alarm, .set_alarm = pl030_set_alarm, }; diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c index d829ea6..c2a9cdd 100644 --- a/drivers/rtc/rtc-pl031.c +++ b/drivers/rtc/rtc-pl031.c @@ -176,20 +176,6 @@ static int pl031_stv2_set_time(struct device *dev, struct rtc_time *tm) return ret; } -static int pl031_stv2_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) -{ - struct pl031_local *ldata = dev_get_drvdata(dev); - int ret; - - ret = pl031_stv2_time_to_tm(readl(ldata->base + RTC_MR), - readl(ldata->base + RTC_YMR), &alarm->time); - - alarm->pending = readl(ldata->base + RTC_RIS) & RTC_BIT_AI; - alarm->enabled = readl(ldata->base + RTC_IMSC) & RTC_BIT_AI; - - return ret; -} - static int pl031_stv2_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) { struct pl031_local *ldata = dev_get_drvdata(dev); @@ -262,18 +248,6 @@ static int pl031_set_time(struct device *dev, struct rtc_time *tm) return ret; } -static int pl031_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) -{ - struct pl031_local *ldata = dev_get_drvdata(dev); - - rtc_time_to_tm(readl(ldata->base + RTC_MR), &alarm->time); - - alarm->pending = readl(ldata->base + RTC_RIS) & RTC_BIT_AI; - alarm->enabled = readl(ldata->base + RTC_IMSC) & RTC_BIT_AI; - - return 0; -} - static int pl031_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) { struct pl031_local *ldata = dev_get_drvdata(dev); @@ -377,7 +351,6 @@ err_req: static struct rtc_class_ops arm_pl031_ops = { .read_time = pl031_read_time, .set_time = pl031_set_time, - .read_alarm = pl031_read_alarm, .set_alarm = pl031_set_alarm, .alarm_irq_enable = pl031_alarm_irq_enable, }; @@ -386,7 +359,6 @@ static struct rtc_class_ops arm_pl031_ops = { static struct rtc_class_ops stv1_pl031_ops = { .read_time = pl031_read_time, .set_time = pl031_set_time, - .read_alarm = pl031_read_alarm, .set_alarm = pl031_set_alarm, .alarm_irq_enable = pl031_alarm_irq_enable, }; @@ -395,7 +367,6 @@ static struct rtc_class_ops stv1_pl031_ops = { static struct rtc_class_ops stv2_pl031_ops = { .read_time = pl031_stv2_read_time, .set_time = pl031_stv2_set_time, - .read_alarm = pl031_stv2_read_alarm, .set_alarm = pl031_stv2_set_alarm, .alarm_irq_enable = pl031_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-pxa.c b/drivers/rtc/rtc-pxa.c index fc9f499..6e31dc3 100644 --- a/drivers/rtc/rtc-pxa.c +++ b/drivers/rtc/rtc-pxa.c @@ -246,21 +246,6 @@ static int pxa_rtc_set_time(struct device *dev, struct rtc_time *tm) return 0; } -static int pxa_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) -{ - struct pxa_rtc *pxa_rtc = dev_get_drvdata(dev); - u32 rtsr, ryar, rdar; - - ryar = rtc_readl(pxa_rtc, RYAR1); - rdar = rtc_readl(pxa_rtc, RDAR1); - tm_calc(ryar, rdar, &alrm->time); - - rtsr = rtc_readl(pxa_rtc, RTSR); - alrm->enabled = (rtsr & RTSR_RDALE1) ? 1 : 0; - alrm->pending = (rtsr & RTSR_RDAL1) ? 1 : 0; - return 0; -} - static int pxa_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) { struct pxa_rtc *pxa_rtc = dev_get_drvdata(dev); @@ -302,7 +287,6 @@ static const struct rtc_class_ops pxa_rtc_ops = { .release = pxa_rtc_release, .read_time = pxa_rtc_read_time, .set_time = pxa_rtc_set_time, - .read_alarm = pxa_rtc_read_alarm, .set_alarm = pxa_rtc_set_alarm, .alarm_irq_enable = pxa_alarm_irq_enable, .proc = pxa_rtc_proc, diff --git a/drivers/rtc/rtc-rs5c372.c b/drivers/rtc/rtc-rs5c372.c index 6aaa155..ac1e57f 100644 --- a/drivers/rtc/rtc-rs5c372.c +++ b/drivers/rtc/rtc-rs5c372.c @@ -366,43 +366,6 @@ static int rs5c_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) } -/* NOTE: Since RTC_WKALM_{RD,SET} were originally defined for EFI, - * which only exposes a polled programming interface; and since - * these calls map directly to those EFI requests; we don't demand - * we have an IRQ for this chip when we go through this API. - * - * The older x86_pc derived RTC_ALM_{READ,SET} calls require irqs - * though, managed through RTC_AIE_{ON,OFF} requests. - */ - -static int rs5c_read_alarm(struct device *dev, struct rtc_wkalrm *t) -{ - struct i2c_client *client = to_i2c_client(dev); - struct rs5c372 *rs5c = i2c_get_clientdata(client); - int status; - - status = rs5c_get_regs(rs5c); - if (status < 0) - return status; - - /* report alarm time */ - t->time.tm_sec = 0; - t->time.tm_min = bcd2bin(rs5c->regs[RS5C_REG_ALARM_A_MIN] & 0x7f); - t->time.tm_hour = rs5c_reg2hr(rs5c, rs5c->regs[RS5C_REG_ALARM_A_HOURS]); - t->time.tm_mday = -1; - t->time.tm_mon = -1; - t->time.tm_year = -1; - t->time.tm_wday = -1; - t->time.tm_yday = -1; - t->time.tm_isdst = -1; - - /* ... and status */ - t->enabled = !!(rs5c->regs[RS5C_REG_CTRL1] & RS5C_CTRL1_AALE); - t->pending = !!(rs5c->regs[RS5C_REG_CTRL2] & RS5C_CTRL2_AAFG); - - return 0; -} - static int rs5c_set_alarm(struct device *dev, struct rtc_wkalrm *t) { struct i2c_client *client = to_i2c_client(dev); @@ -483,7 +446,6 @@ static const struct rtc_class_ops rs5c372_rtc_ops = { .ioctl = rs5c_rtc_ioctl, .read_time = rs5c372_rtc_read_time, .set_time = rs5c372_rtc_set_time, - .read_alarm = rs5c_read_alarm, .set_alarm = rs5c_set_alarm, .alarm_irq_enable = rs5c_rtc_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-rx8025.c b/drivers/rtc/rtc-rx8025.c index fde172f..01fa5c7 100644 --- a/drivers/rtc/rtc-rx8025.c +++ b/drivers/rtc/rtc-rx8025.c @@ -315,51 +315,6 @@ out: } /* Alarm support */ -static int rx8025_read_alarm(struct device *dev, struct rtc_wkalrm *t) -{ - struct rx8025_data *rx8025 = dev_get_drvdata(dev); - struct i2c_client *client = rx8025->client; - u8 ctrl2, ald[2]; - int err; - - if (client->irq <= 0) - return -EINVAL; - - err = rx8025_read_regs(client, RX8025_REG_ALDMIN, 2, ald); - if (err) - return err; - - err = rx8025_read_reg(client, RX8025_REG_CTRL2, &ctrl2); - if (err) - return err; - - dev_dbg(dev, "%s: read alarm 0x%02x 0x%02x ctrl2 %02x\n", - __func__, ald[0], ald[1], ctrl2); - - /* Hardware alarms precision is 1 minute! */ - t->time.tm_sec = 0; - t->time.tm_min = bcd2bin(ald[0] & 0x7f); - if (rx8025->ctrl1 & RX8025_BIT_CTRL1_1224) - t->time.tm_hour = bcd2bin(ald[1] & 0x3f); - else - t->time.tm_hour = bcd2bin(ald[1] & 0x1f) % 12 - + (ald[1] & 0x20 ? 12 : 0); - - t->time.tm_wday = -1; - t->time.tm_mday = -1; - t->time.tm_mon = -1; - t->time.tm_year = -1; - - dev_dbg(dev, "%s: date: %ds %dm %dh %dmd %dm %dy\n", - __func__, - t->time.tm_sec, t->time.tm_min, t->time.tm_hour, - t->time.tm_mday, t->time.tm_mon, t->time.tm_year); - t->enabled = !!(rx8025->ctrl1 & RX8025_BIT_CTRL1_DALE); - t->pending = (ctrl2 & RX8025_BIT_CTRL2_DAFG) && t->enabled; - - return err; -} - static int rx8025_set_alarm(struct device *dev, struct rtc_wkalrm *t) { struct i2c_client *client = to_i2c_client(dev); @@ -427,7 +382,6 @@ static int rx8025_alarm_irq_enable(struct device *dev, unsigned int enabled) static struct rtc_class_ops rx8025_rtc_ops = { .read_time = rx8025_get_time, .set_time = rx8025_set_time, - .read_alarm = rx8025_read_alarm, .set_alarm = rx8025_set_alarm, .alarm_irq_enable = rx8025_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c index 6d60958..9239c2f 100644 --- a/drivers/rtc/rtc-s3c.c +++ b/drivers/rtc/rtc-s3c.c @@ -183,66 +183,6 @@ static int s3c_rtc_settime(struct device *dev, struct rtc_time *tm) return 0; } -static int s3c_rtc_getalarm(struct device *dev, struct rtc_wkalrm *alrm) -{ - struct rtc_time *alm_tm = &alrm->time; - void __iomem *base = s3c_rtc_base; - unsigned int alm_en; - - alm_tm->tm_sec = readb(base + S3C2410_ALMSEC); - alm_tm->tm_min = readb(base + S3C2410_ALMMIN); - alm_tm->tm_hour = readb(base + S3C2410_ALMHOUR); - alm_tm->tm_mon = readb(base + S3C2410_ALMMON); - alm_tm->tm_mday = readb(base + S3C2410_ALMDATE); - alm_tm->tm_year = readb(base + S3C2410_ALMYEAR); - - alm_en = readb(base + S3C2410_RTCALM); - - alrm->enabled = (alm_en & S3C2410_RTCALM_ALMEN) ? 1 : 0; - - pr_debug("read alarm %d, %04d.%02d.%02d %02d:%02d:%02d\n", - alm_en, - 1900 + alm_tm->tm_year, alm_tm->tm_mon, alm_tm->tm_mday, - alm_tm->tm_hour, alm_tm->tm_min, alm_tm->tm_sec); - - - /* decode the alarm enable field */ - - if (alm_en & S3C2410_RTCALM_SECEN) - alm_tm->tm_sec = bcd2bin(alm_tm->tm_sec); - else - alm_tm->tm_sec = -1; - - if (alm_en & S3C2410_RTCALM_MINEN) - alm_tm->tm_min = bcd2bin(alm_tm->tm_min); - else - alm_tm->tm_min = -1; - - if (alm_en & S3C2410_RTCALM_HOUREN) - alm_tm->tm_hour = bcd2bin(alm_tm->tm_hour); - else - alm_tm->tm_hour = -1; - - if (alm_en & S3C2410_RTCALM_DAYEN) - alm_tm->tm_mday = bcd2bin(alm_tm->tm_mday); - else - alm_tm->tm_mday = -1; - - if (alm_en & S3C2410_RTCALM_MONEN) { - alm_tm->tm_mon = bcd2bin(alm_tm->tm_mon); - alm_tm->tm_mon -= 1; - } else { - alm_tm->tm_mon = -1; - } - - if (alm_en & S3C2410_RTCALM_YEAREN) - alm_tm->tm_year = bcd2bin(alm_tm->tm_year); - else - alm_tm->tm_year = -1; - - return 0; -} - static int s3c_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) { struct rtc_time *tm = &alrm->time; @@ -344,7 +284,6 @@ static const struct rtc_class_ops s3c_rtcops = { .release = s3c_rtc_release, .read_time = s3c_rtc_gettime, .set_time = s3c_rtc_settime, - .read_alarm = s3c_rtc_getalarm, .set_alarm = s3c_rtc_setalarm, .proc = s3c_rtc_proc, .alarm_irq_enable = s3c_rtc_setaie, diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c index d1a2b0b..df1804f 100644 --- a/drivers/rtc/rtc-sa1100.c +++ b/drivers/rtc/rtc-sa1100.c @@ -339,17 +339,6 @@ static int sa1100_rtc_set_time(struct device *dev, struct rtc_time *tm) return ret; } -static int sa1100_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) -{ - u32 rtsr; - - memcpy(&alrm->time, &rtc_alarm, sizeof(struct rtc_time)); - rtsr = RTSR; - alrm->enabled = (rtsr & RTSR_ALE) ? 1 : 0; - alrm->pending = (rtsr & RTSR_AL) ? 1 : 0; - return 0; -} - static int sa1100_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) { int ret; @@ -389,7 +378,6 @@ static const struct rtc_class_ops sa1100_rtc_ops = { .ioctl = sa1100_rtc_ioctl, .read_time = sa1100_rtc_read_time, .set_time = sa1100_rtc_set_time, - .read_alarm = sa1100_rtc_read_alarm, .set_alarm = sa1100_rtc_set_alarm, .proc = sa1100_rtc_proc, .alarm_irq_enable = sa1100_rtc_alarm_irq_enable, diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c index 1485449..956c6fb 100644 --- a/drivers/rtc/rtc-sh.c +++ b/drivers/rtc/rtc-sh.c @@ -473,45 +473,6 @@ static int sh_rtc_set_time(struct device *dev, struct rtc_time *tm) return 0; } -static inline int sh_rtc_read_alarm_value(struct sh_rtc *rtc, int reg_off) -{ - unsigned int byte; - int value = 0xff; /* return 0xff for ignored values */ - - byte = readb(rtc->regbase + reg_off); - if (byte & AR_ENB) { - byte &= ~AR_ENB; /* strip the enable bit */ - value = bcd2bin(byte); - } - - return value; -} - -static int sh_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *wkalrm) -{ - struct platform_device *pdev = to_platform_device(dev); - struct sh_rtc *rtc = platform_get_drvdata(pdev); - struct rtc_time *tm = &wkalrm->time; - - spin_lock_irq(&rtc->lock); - - tm->tm_sec = sh_rtc_read_alarm_value(rtc, RSECAR); - tm->tm_min = sh_rtc_read_alarm_value(rtc, RMINAR); - tm->tm_hour = sh_rtc_read_alarm_value(rtc, RHRAR); - tm->tm_wday = sh_rtc_read_alarm_value(rtc, RWKAR); - tm->tm_mday = sh_rtc_read_alarm_value(rtc, RDAYAR); - tm->tm_mon = sh_rtc_read_alarm_value(rtc, RMONAR); - if (tm->tm_mon > 0) - tm->tm_mon -= 1; /* RTC is 1-12, tm_mon is 0-11 */ - tm->tm_year = 0xffff; - - wkalrm->enabled = (readb(rtc->regbase + RCR1) & RCR1_AIE) ? 1 : 0; - - spin_unlock_irq(&rtc->lock); - - return 0; -} - static inline void sh_rtc_write_alarm_value(struct sh_rtc *rtc, int value, int reg_off) { @@ -601,7 +562,6 @@ static struct rtc_class_ops sh_rtc_ops = { .ioctl = sh_rtc_ioctl, .read_time = sh_rtc_read_time, .set_time = sh_rtc_set_time, - .read_alarm = sh_rtc_read_alarm, .set_alarm = sh_rtc_set_alarm, .proc = sh_rtc_proc, .alarm_irq_enable = sh_rtc_alarm_irq_enable, diff --git a/drivers/rtc/rtc-stk17ta8.c b/drivers/rtc/rtc-stk17ta8.c index 3b94367..2a945fa 100644 --- a/drivers/rtc/rtc-stk17ta8.c +++ b/drivers/rtc/rtc-stk17ta8.c @@ -183,21 +183,6 @@ static int stk17ta8_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) return 0; } -static int stk17ta8_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) -{ - struct platform_device *pdev = to_platform_device(dev); - struct rtc_plat_data *pdata = platform_get_drvdata(pdev); - - if (pdata->irq <= 0) - return -EINVAL; - alrm->time.tm_mday = pdata->alrm_mday < 0 ? 0 : pdata->alrm_mday; - alrm->time.tm_hour = pdata->alrm_hour < 0 ? 0 : pdata->alrm_hour; - alrm->time.tm_min = pdata->alrm_min < 0 ? 0 : pdata->alrm_min; - alrm->time.tm_sec = pdata->alrm_sec < 0 ? 0 : pdata->alrm_sec; - alrm->enabled = (pdata->irqen & RTC_AF) ? 1 : 0; - return 0; -} - static irqreturn_t stk17ta8_rtc_interrupt(int irq, void *dev_id) { struct platform_device *pdev = dev_id; @@ -239,7 +224,6 @@ static int stk17ta8_rtc_alarm_irq_enable(struct device *dev, static const struct rtc_class_ops stk17ta8_rtc_ops = { .read_time = stk17ta8_rtc_read_time, .set_time = stk17ta8_rtc_set_time, - .read_alarm = stk17ta8_rtc_read_alarm, .set_alarm = stk17ta8_rtc_set_alarm, .alarm_irq_enable = stk17ta8_rtc_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-stmp3xxx.c b/drivers/rtc/rtc-stmp3xxx.c index 572e953..035c67c 100644 --- a/drivers/rtc/rtc-stmp3xxx.c +++ b/drivers/rtc/rtc-stmp3xxx.c @@ -115,14 +115,6 @@ static int stmp3xxx_alarm_irq_enable(struct device *dev, unsigned int enabled) return 0; } -static int stmp3xxx_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm) -{ - struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev); - - rtc_time_to_tm(__raw_readl(rtc_data->io + HW_RTC_ALARM), &alm->time); - return 0; -} - static int stmp3xxx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm) { unsigned long t; @@ -138,7 +130,6 @@ static struct rtc_class_ops stmp3xxx_rtc_ops = { stmp3xxx_alarm_irq_enable, .read_time = stmp3xxx_rtc_gettime, .set_mmss = stmp3xxx_rtc_set_mmss, - .read_alarm = stmp3xxx_rtc_read_alarm, .set_alarm = stmp3xxx_rtc_set_alarm, }; diff --git a/drivers/rtc/rtc-test.c b/drivers/rtc/rtc-test.c index a82d6fe..61ad5ab 100644 --- a/drivers/rtc/rtc-test.c +++ b/drivers/rtc/rtc-test.c @@ -15,12 +15,6 @@ static struct platform_device *test0 = NULL, *test1 = NULL; -static int test_rtc_read_alarm(struct device *dev, - struct rtc_wkalrm *alrm) -{ - return 0; -} - static int test_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) { @@ -58,7 +52,6 @@ static int test_rtc_alarm_irq_enable(struct device *dev, unsigned int enable) static const struct rtc_class_ops test_rtc_ops = { .proc = test_rtc_proc, .read_time = test_rtc_read_time, - .read_alarm = test_rtc_read_alarm, .set_alarm = test_rtc_set_alarm, .set_mmss = test_rtc_set_mmss, .alarm_irq_enable = test_rtc_alarm_irq_enable, diff --git a/drivers/rtc/rtc-twl.c b/drivers/rtc/rtc-twl.c index f9a2799..51e5dd2 100644 --- a/drivers/rtc/rtc-twl.c +++ b/drivers/rtc/rtc-twl.c @@ -295,36 +295,6 @@ out: return ret; } -/* - * Gets current TWL RTC alarm time. - */ -static int twl_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm) -{ - unsigned char rtc_data[ALL_TIME_REGS + 1]; - int ret; - - ret = twl_i2c_read(TWL_MODULE_RTC, rtc_data, - (rtc_reg_map[REG_ALARM_SECONDS_REG]), ALL_TIME_REGS); - if (ret < 0) { - dev_err(dev, "rtc_read_alarm error %d\n", ret); - return ret; - } - - /* some of these fields may be wildcard/"match all" */ - alm->time.tm_sec = bcd2bin(rtc_data[0]); - alm->time.tm_min = bcd2bin(rtc_data[1]); - alm->time.tm_hour = bcd2bin(rtc_data[2]); - alm->time.tm_mday = bcd2bin(rtc_data[3]); - alm->time.tm_mon = bcd2bin(rtc_data[4]) - 1; - alm->time.tm_year = bcd2bin(rtc_data[5]) + 100; - - /* report cached alarm enable state */ - if (rtc_irq_bits & BIT_RTC_INTERRUPTS_REG_IT_ALARM_M) - alm->enabled = 1; - - return ret; -} - static int twl_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm) { unsigned char alarm_data[ALL_TIME_REGS + 1]; @@ -418,7 +388,6 @@ out: static struct rtc_class_ops twl_rtc_ops = { .read_time = twl_rtc_read_time, .set_time = twl_rtc_set_time, - .read_alarm = twl_rtc_read_alarm, .set_alarm = twl_rtc_set_alarm, .alarm_irq_enable = twl_rtc_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-tx4939.c b/drivers/rtc/rtc-tx4939.c index ec6313d..8732231 100644 --- a/drivers/rtc/rtc-tx4939.c +++ b/drivers/rtc/rtc-tx4939.c @@ -122,35 +122,6 @@ static int tx4939_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) return ret; } -static int tx4939_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) -{ - struct tx4939rtc_plat_data *pdata = get_tx4939rtc_plat_data(dev); - struct tx4939_rtc_reg __iomem *rtcreg = pdata->rtcreg; - int i, ret; - unsigned long sec; - unsigned char buf[6]; - u32 ctl; - - spin_lock_irq(&pdata->lock); - ret = tx4939_rtc_cmd(rtcreg, - TX4939_RTCCTL_COMMAND_GETALARM | - (__raw_readl(&rtcreg->ctl) & TX4939_RTCCTL_ALME)); - if (ret) { - spin_unlock_irq(&pdata->lock); - return ret; - } - __raw_writel(2, &rtcreg->adr); - for (i = 2; i < 6; i++) - buf[i] = __raw_readl(&rtcreg->dat); - ctl = __raw_readl(&rtcreg->ctl); - alrm->enabled = (ctl & TX4939_RTCCTL_ALME) ? 1 : 0; - alrm->pending = (ctl & TX4939_RTCCTL_ALMD) ? 1 : 0; - spin_unlock_irq(&pdata->lock); - sec = (buf[5] << 24) | (buf[4] << 16) | (buf[3] << 8) | buf[2]; - rtc_time_to_tm(sec, &alrm->time); - return rtc_valid_tm(&alrm->time); -} - static int tx4939_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) { struct tx4939rtc_plat_data *pdata = get_tx4939rtc_plat_data(dev); @@ -182,7 +153,6 @@ static irqreturn_t tx4939_rtc_interrupt(int irq, void *dev_id) static const struct rtc_class_ops tx4939_rtc_ops = { .read_time = tx4939_rtc_read_time, - .read_alarm = tx4939_rtc_read_alarm, .set_alarm = tx4939_rtc_set_alarm, .set_mmss = tx4939_rtc_set_mmss, .alarm_irq_enable = tx4939_rtc_alarm_irq_enable, diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c index c5698cd..3264a74 100644 --- a/drivers/rtc/rtc-vr41xx.c +++ b/drivers/rtc/rtc-vr41xx.c @@ -161,25 +161,6 @@ static int vr41xx_rtc_set_time(struct device *dev, struct rtc_time *time) return 0; } -static int vr41xx_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *wkalrm) -{ - unsigned long low, mid, high; - struct rtc_time *time = &wkalrm->time; - - spin_lock_irq(&rtc_lock); - - low = rtc1_read(ECMPLREG); - mid = rtc1_read(ECMPMREG); - high = rtc1_read(ECMPHREG); - wkalrm->enabled = alarm_enabled; - - spin_unlock_irq(&rtc_lock); - - rtc_time_to_tm((high << 17) | (mid << 1) | (low >> 15), time); - - return 0; -} - static int vr41xx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *wkalrm) { unsigned long alarm_sec; @@ -276,7 +257,6 @@ static const struct rtc_class_ops vr41xx_rtc_ops = { .ioctl = vr41xx_rtc_ioctl, .read_time = vr41xx_rtc_read_time, .set_time = vr41xx_rtc_set_time, - .read_alarm = vr41xx_rtc_read_alarm, .set_alarm = vr41xx_rtc_set_alarm, }; diff --git a/drivers/rtc/rtc-wm831x.c b/drivers/rtc/rtc-wm831x.c index bdc909b..4962982 100644 --- a/drivers/rtc/rtc-wm831x.c +++ b/drivers/rtc/rtc-wm831x.c @@ -210,41 +210,6 @@ static int wm831x_rtc_set_mmss(struct device *dev, unsigned long time) return 0; } -/* - * Read alarm time and date in RTC - */ -static int wm831x_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm) -{ - struct wm831x_rtc *wm831x_rtc = dev_get_drvdata(dev); - int ret; - u16 data[2]; - u32 time; - - ret = wm831x_bulk_read(wm831x_rtc->wm831x, WM831X_RTC_ALARM_1, - 2, data); - if (ret != 0) { - dev_err(dev, "Failed to read alarm time: %d\n", ret); - return ret; - } - - time = (data[0] << 16) | data[1]; - - rtc_time_to_tm(time, &alrm->time); - - ret = wm831x_reg_read(wm831x_rtc->wm831x, WM831X_RTC_CONTROL); - if (ret < 0) { - dev_err(dev, "Failed to read RTC control: %d\n", ret); - return ret; - } - - if (ret & WM831X_RTC_ALM_ENA) - alrm->enabled = 1; - else - alrm->enabled = 0; - - return 0; -} - static int wm831x_rtc_stop_alarm(struct wm831x_rtc *wm831x_rtc) { wm831x_rtc->alarm_enabled = 0; @@ -336,7 +301,6 @@ static irqreturn_t wm831x_per_irq(int irq, void *data) static const struct rtc_class_ops wm831x_rtc_ops = { .read_time = wm831x_rtc_readtime, .set_mmss = wm831x_rtc_set_mmss, - .read_alarm = wm831x_rtc_readalarm, .set_alarm = wm831x_rtc_setalarm, .alarm_irq_enable = wm831x_rtc_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-wm8350.c b/drivers/rtc/rtc-wm8350.c index 6642142..e48c9f1 100644 --- a/drivers/rtc/rtc-wm8350.c +++ b/drivers/rtc/rtc-wm8350.c @@ -140,55 +140,6 @@ static int wm8350_rtc_settime(struct device *dev, struct rtc_time *tm) return ret; } -/* - * Read alarm time and date in RTC - */ -static int wm8350_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm) -{ - struct wm8350 *wm8350 = dev_get_drvdata(dev); - struct rtc_time *tm = &alrm->time; - u16 time[4]; - int ret; - - ret = wm8350_block_read(wm8350, WM8350_ALARM_SECONDS_MINUTES, 4, time); - if (ret < 0) - return ret; - - tm->tm_sec = time[0] & WM8350_RTC_ALMSECS_MASK; - if (tm->tm_sec == WM8350_RTC_ALMSECS_MASK) - tm->tm_sec = -1; - - tm->tm_min = time[0] & WM8350_RTC_ALMMINS_MASK; - if (tm->tm_min == WM8350_RTC_ALMMINS_MASK) - tm->tm_min = -1; - else - tm->tm_min >>= WM8350_RTC_ALMMINS_SHIFT; - - tm->tm_hour = time[1] & WM8350_RTC_ALMHRS_MASK; - if (tm->tm_hour == WM8350_RTC_ALMHRS_MASK) - tm->tm_hour = -1; - - tm->tm_wday = ((time[1] >> WM8350_RTC_ALMDAY_SHIFT) & 0x7) - 1; - if (tm->tm_wday > 7) - tm->tm_wday = -1; - - tm->tm_mon = time[2] & WM8350_RTC_ALMMTH_MASK; - if (tm->tm_mon == WM8350_RTC_ALMMTH_MASK) - tm->tm_mon = -1; - else - tm->tm_mon = (tm->tm_mon >> WM8350_RTC_ALMMTH_SHIFT) - 1; - - tm->tm_mday = (time[2] & WM8350_RTC_ALMDATE_MASK); - if (tm->tm_mday == WM8350_RTC_ALMDATE_MASK) - tm->tm_mday = -1; - - tm->tm_year = -1; - - alrm->enabled = !(time[3] & WM8350_RTC_ALMSTS); - - return 0; -} - static int wm8350_rtc_stop_alarm(struct wm8350 *wm8350) { int retries = WM8350_SET_ALM_RETRIES; @@ -334,7 +285,6 @@ static irqreturn_t wm8350_rtc_update_handler(int irq, void *data) static const struct rtc_class_ops wm8350_rtc_ops = { .read_time = wm8350_rtc_readtime, .set_time = wm8350_rtc_settime, - .read_alarm = wm8350_rtc_readalarm, .set_alarm = wm8350_rtc_setalarm, .alarm_irq_enable = wm8350_rtc_alarm_irq_enable, }; diff --git a/drivers/rtc/rtc-x1205.c b/drivers/rtc/rtc-x1205.c index 9aae491..ac9f31e 100644 --- a/drivers/rtc/rtc-x1205.c +++ b/drivers/rtc/rtc-x1205.c @@ -436,31 +436,6 @@ static int x1205_validate_client(struct i2c_client *client) return 0; } -static int x1205_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) -{ - int err; - unsigned char intreg, status; - static unsigned char int_addr[2] = { 0, X1205_REG_INT }; - struct i2c_client *client = to_i2c_client(dev); - struct i2c_msg msgs[] = { - { client->addr, 0, 2, int_addr }, /* setup read ptr */ - { client->addr, I2C_M_RD, 1, &intreg }, /* read INT register */ - }; - - /* read interrupt register and status register */ - if (i2c_transfer(client->adapter, &msgs[0], 2) != 2) { - dev_err(&client->dev, "%s: read error\n", __func__); - return -EIO; - } - err = x1205_get_status(client, &status); - if (err == 0) { - alrm->pending = (status & X1205_SR_AL0) ? 1 : 0; - alrm->enabled = (intreg & X1205_INT_AL0E) ? 1 : 0; - err = x1205_get_datetime(client, &alrm->time, X1205_ALM0_BASE); - } - return err; -} - static int x1205_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) { return x1205_set_datetime(to_i2c_client(dev), @@ -496,7 +471,6 @@ static const struct rtc_class_ops x1205_rtc_ops = { .proc = x1205_rtc_proc, .read_time = x1205_rtc_read_time, .set_time = x1205_rtc_set_time, - .read_alarm = x1205_rtc_read_alarm, .set_alarm = x1205_rtc_set_alarm, }; diff --git a/include/linux/rtc.h b/include/linux/rtc.h index a69249d..7327376 100644 --- a/include/linux/rtc.h +++ b/include/linux/rtc.h @@ -143,7 +143,6 @@ struct rtc_class_ops { int (*ioctl)(struct device *, unsigned int, unsigned long); int (*read_time)(struct device *, struct rtc_time *); int (*set_time)(struct device *, struct rtc_time *); - int (*read_alarm)(struct device *, struct rtc_wkalrm *); int (*set_alarm)(struct device *, struct rtc_wkalrm *); int (*proc)(struct device *, struct seq_file *); int (*set_mmss)(struct device *, unsigned long secs); -- 1.7.3.2.146.gca209 ^ permalink raw reply related [flat|nested] 32+ messages in thread
* Re: [rtc-linux] [PATCH 04/10] RTC: Cleanup rtc_class_ops->read_alarm() 2011-02-21 23:55 ` [PATCH 04/10] RTC: Cleanup rtc_class_ops->read_alarm() John Stultz @ 2011-02-22 2:34 ` Mark Brown 2011-02-22 2:55 ` John Stultz 0 siblings, 1 reply; 32+ messages in thread From: Mark Brown @ 2011-02-22 2:34 UTC (permalink / raw) To: rtc-linux Cc: LKML, John Stultz, Thomas Gleixner, Alessandro Zummo, Marcelo Roberto Jimenez On Mon, Feb 21, 2011 at 03:55:32PM -0800, John Stultz wrote: > With the generic rtc code managing the now virtualized alarm timer, > no one actually calls rtc_clas_ops->read_alarm(). > We do check that it exists in rtc_read_alarm(), but that is only > to verify that the hardware supports irqs. The same test can > be done by checking set_alarm instead. > This patch changes the the read_alarm check to set_alarm, and then > removes the read_alarm method and its implementations in the rt > drivers. Can you go into more detail on the rationale behind this virtualised functionality and how it works? I'd really expect the RTC alarm to be preserved over system reboots (on some systems it can be used to initiate a boot) and that would mean that we need to go to the hardware for at least the initial configuration. ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [rtc-linux] [PATCH 04/10] RTC: Cleanup rtc_class_ops->read_alarm() 2011-02-22 2:34 ` [rtc-linux] " Mark Brown @ 2011-02-22 2:55 ` John Stultz 2011-02-22 8:09 ` john stultz 0 siblings, 1 reply; 32+ messages in thread From: John Stultz @ 2011-02-22 2:55 UTC (permalink / raw) To: Mark Brown Cc: rtc-linux, LKML, Thomas Gleixner, Alessandro Zummo, Marcelo Roberto Jimenez On Tue, 2011-02-22 at 02:34 +0000, Mark Brown wrote: > On Mon, Feb 21, 2011 at 03:55:32PM -0800, John Stultz wrote: > > With the generic rtc code managing the now virtualized alarm timer, > > no one actually calls rtc_clas_ops->read_alarm(). > > > We do check that it exists in rtc_read_alarm(), but that is only > > to verify that the hardware supports irqs. The same test can > > be done by checking set_alarm instead. > > > This patch changes the the read_alarm check to set_alarm, and then > > removes the read_alarm method and its implementations in the rt > > drivers. > > Can you go into more detail on the rationale behind this virtualised > functionality and how it works? I'd really expect the RTC alarm to be > preserved over system reboots (on some systems it can be used to > initiate a boot) and that would mean that we need to go to the hardware > for at least the initial configuration. So with respect to the rationale: The difference with the new code (already in for 2.6.38), is that when alarms are set via the userland interface, instead of directly manipulating the hardware, it creates a rtc_timer event that is managed by the kernel. The kernel then looks at the list of rtc_timers and sets the RTC for soonest rtc_timer. When the alarm occurs (possibly waking up the system), the kernel notifies the waiting userland app and then looks at the timer list to see if there are any more events to program into the hardware. This allows us in the future to multiplex events onto the RTC hardware from different sources without breaking compatibility. Right now, if two applications want to set a wake alarm on the RTC , they have to coordinate their access to the rtc device (or the machine has to have multiple RTC devices). Soon, with my posix alarm timers work, those two applications would be able to set standard posix timers against CLOCK_REALTIME_ALARM, and the kernel will manage the RTC hardware to wake the system up for both application's alarms. No coordination needed. Now, to your point about persistence across reboots: It is an interesting point to consider. So currently, if the hardware supports it, then the behavior should remain the same: As long as no application sets a new alarm, the previous alarm should persist in the RTC hardware. However, an application's ability to notice that such an alarm is set, is currently limited. So your point about reading the hardware to initialize the state is quite valid, and shows a good reason to preserve the read_alarm() method. Thus, I'll drop this patch for my 2.6.39 queue. And I'll try to fix the current initialization limitation to ensure applications can detect alarm persistence. Thanks for pointing this issue out! -john ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [rtc-linux] [PATCH 04/10] RTC: Cleanup rtc_class_ops->read_alarm() 2011-02-22 2:55 ` John Stultz @ 2011-02-22 8:09 ` john stultz 2011-02-22 12:51 ` Marcelo Roberto Jimenez 2011-02-22 18:16 ` Mark Brown 0 siblings, 2 replies; 32+ messages in thread From: john stultz @ 2011-02-22 8:09 UTC (permalink / raw) To: Mark Brown Cc: rtc-linux, LKML, Thomas Gleixner, Alessandro Zummo, Marcelo Roberto Jimenez On Mon, 2011-02-21 at 18:55 -0800, John Stultz wrote: > On Tue, 2011-02-22 at 02:34 +0000, Mark Brown wrote: > > Can you go into more detail on the rationale behind this virtualised > > functionality and how it works? I'd really expect the RTC alarm to be > > preserved over system reboots (on some systems it can be used to > > initiate a boot) and that would mean that we need to go to the hardware > > for at least the initial configuration. [snip] > Now, to your point about persistence across reboots: > > It is an interesting point to consider. > > So currently, if the hardware supports it, then the behavior should > remain the same: As long as no application sets a new alarm, the > previous alarm should persist in the RTC hardware. > > However, an application's ability to notice that such an alarm is set, > is currently limited. So your point about reading the hardware to > initialize the state is quite valid, and shows a good reason to preserve > the read_alarm() method. So I've been working on a fix for the issue described here, but have run into a few complications: 1) Prior to my rework landing, on the rtc-cmos driver, after a reboot, calls to rtc_read_alarm() do return the alarm time from hardware. However, the AIE mode bit is off (even if it was left on). So the alarm does not seem like it would persist across reboots, and the value returned form rtc_read_alarm is technically invalid as the code to fill in the -1 fields doesn't run. I realize that the cmos is fairly simplistic, but do you have examples of hardware where the AIE mode does persist on bootup? 2) One larger complication I see coming down the road with this is how do we handle persistence with multiplexed events? If we have two rtc_timers set to fire, one at 1pm and the other at 3pm. If we reboot the box at noon, only the 1pm timer will persist. This could cause some additional confusion if the first timer was a posix-alarm-timer and the second was the classic wake alarm set by /dev/rtc0. In that case, after a reboot at noon, the system will show a 1pm wake alarm via /dev/rtc0. I need to think more about #2. I suspect we could claim that soonest alarm should be preserved regardless of what its source was. Just so I can better get a grip of the cases your considering, could you maybe give me some more detailed examples of where you'd like to see the alarm timer be set and then persist across multiple power cycles before firing? And how is that persistent value managed by the application setting it? thanks -john ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [rtc-linux] [PATCH 04/10] RTC: Cleanup rtc_class_ops->read_alarm() 2011-02-22 8:09 ` john stultz @ 2011-02-22 12:51 ` Marcelo Roberto Jimenez 2011-02-22 19:35 ` john stultz 2011-02-22 18:16 ` Mark Brown 1 sibling, 1 reply; 32+ messages in thread From: Marcelo Roberto Jimenez @ 2011-02-22 12:51 UTC (permalink / raw) To: john stultz Cc: Mark Brown, rtc-linux, LKML, Thomas Gleixner, Alessandro Zummo Hi Folks, On Tue, Feb 22, 2011 at 05:09, john stultz <johnstul@us.ibm.com> wrote: > On Mon, 2011-02-21 at 18:55 -0800, John Stultz wrote: >> On Tue, 2011-02-22 at 02:34 +0000, Mark Brown wrote: >> > Can you go into more detail on the rationale behind this virtualised >> > functionality and how it works? I'd really expect the RTC alarm to be >> > preserved over system reboots (on some systems it can be used to >> > initiate a boot) and that would mean that we need to go to the hardware >> > for at least the initial configuration. > [snip] >> Now, to your point about persistence across reboots: >> >> It is an interesting point to consider. >> >> So currently, if the hardware supports it, then the behavior should >> remain the same: As long as no application sets a new alarm, the >> previous alarm should persist in the RTC hardware. >> >> However, an application's ability to notice that such an alarm is set, >> is currently limited. So your point about reading the hardware to >> initialize the state is quite valid, and shows a good reason to preserve >> the read_alarm() method. Does it matter to application 1 that application 2 has set an alarm before or after the time it has previously set it? With multiplexed events, what is the semantic of read_alarm()? Should it return only the closest alarm to trigger of the application that calls it or should it return the closest alarm of the system? > So I've been working on a fix for the issue described here, but have run > into a few complications: > > 1) Prior to my rework landing, on the rtc-cmos driver, after a reboot, > calls to rtc_read_alarm() do return the alarm time from hardware. > However, the AIE mode bit is off (even if it was left on). So the alarm > does not seem like it would persist across reboots, and the value > returned form rtc_read_alarm is technically invalid as the code to fill > in the -1 fields doesn't run. > > I realize that the cmos is fairly simplistic, but do you have examples > of hardware where the AIE mode does persist on bootup? Seems like cmos can't handle it. I don't know if strongarm will wake up with the timer sane after a hardware reset, there used to be an issue with the timer AIE and UIE interrupt bits waking up with a random value. > 2) One larger complication I see coming down the road with this is how > do we handle persistence with multiplexed events? If we have two > rtc_timers set to fire, one at 1pm and the other at 3pm. If we reboot > the box at noon, only the 1pm timer will persist. > > This could cause some additional confusion if the first timer was a > posix-alarm-timer and the second was the classic wake alarm set > by /dev/rtc0. In that case, after a reboot at noon, the system will show > a 1pm wake alarm via /dev/rtc0. > > I need to think more about #2. I suspect we could claim that soonest > alarm should be preserved regardless of what its source was. Upon a reboot, I believe its a valid assumption that the system has been completely reinitialized, as opposed to a suspend. In this case, none of the original applications that have set alarms will be running on the system. Setting the alarm to do anything more than waking up the system seems odd in this scenario. An application that will keep information across reboots must have other means to persist its information, most likely keeping it in a file so that it can decide what to do upon initialization. Then it could check what alarms it would need to set. > Just so I can better get a grip of the cases your considering, could you > maybe give me some more detailed examples of where you'd like to see the > alarm timer be set and then persist across multiple power cycles before > firing? And how is that persistent value managed by the application > setting it? I am curious about this too. > thanks > -john Regards, Marcelo. ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [rtc-linux] [PATCH 04/10] RTC: Cleanup rtc_class_ops->read_alarm() 2011-02-22 12:51 ` Marcelo Roberto Jimenez @ 2011-02-22 19:35 ` john stultz 2011-02-22 19:51 ` Mark Brown 0 siblings, 1 reply; 32+ messages in thread From: john stultz @ 2011-02-22 19:35 UTC (permalink / raw) To: Marcelo Roberto Jimenez Cc: Mark Brown, rtc-linux, LKML, Thomas Gleixner, Alessandro Zummo On Tue, 2011-02-22 at 09:51 -0300, Marcelo Roberto Jimenez wrote: > Hi Folks, > > On Tue, Feb 22, 2011 at 05:09, john stultz <johnstul@us.ibm.com> wrote: > > On Mon, 2011-02-21 at 18:55 -0800, John Stultz wrote: > >> On Tue, 2011-02-22 at 02:34 +0000, Mark Brown wrote: > >> > Can you go into more detail on the rationale behind this virtualised > >> > functionality and how it works? I'd really expect the RTC alarm to be > >> > preserved over system reboots (on some systems it can be used to > >> > initiate a boot) and that would mean that we need to go to the hardware > >> > for at least the initial configuration. > > [snip] > >> Now, to your point about persistence across reboots: > >> > >> It is an interesting point to consider. > >> > >> So currently, if the hardware supports it, then the behavior should > >> remain the same: As long as no application sets a new alarm, the > >> previous alarm should persist in the RTC hardware. > >> > >> However, an application's ability to notice that such an alarm is set, > >> is currently limited. So your point about reading the hardware to > >> initialize the state is quite valid, and shows a good reason to preserve > >> the read_alarm() method. > > Does it matter to application 1 that application 2 has set an alarm > before or after the time it has previously set it? With multiplexed > events, what is the semantic of read_alarm()? Should it return only > the closest alarm to trigger of the application that calls it or > should it return the closest alarm of the system? So the semantics of read_alarm (well, to be clear: RTC_ALM_READ) should be to return the time that the aie timer will fire. In the past, that was the raw value the hardware was set to. Now that timer is now virtualized, we return the expiration value of the rtc-device's aie_timer. This preserves the previous behavior. If there are other rtc timers set to fire before the aie_timer, the RTC_ALM_READ should still return the time that was programmed in with RTC_ALM_SET. The problem being in the case of a system reboot, we lose our event queue, and only the last value set is remembered. We don't know the source of the last value (weather it was from an RTC_ALM_SET ioctl, or maybe from a posix-alarm-timer). So the question of what is the proper behavior is a little open here. > > So I've been working on a fix for the issue described here, but have run > > into a few complications: > > > > 1) Prior to my rework landing, on the rtc-cmos driver, after a reboot, > > calls to rtc_read_alarm() do return the alarm time from hardware. > > However, the AIE mode bit is off (even if it was left on). So the alarm > > does not seem like it would persist across reboots, and the value > > returned form rtc_read_alarm is technically invalid as the code to fill > > in the -1 fields doesn't run. > > > > I realize that the cmos is fairly simplistic, but do you have examples > > of hardware where the AIE mode does persist on bootup? > > Seems like cmos can't handle it. I don't know if strongarm will wake > up with the timer sane after a hardware reset, there used to be an > issue with the timer AIE and UIE interrupt bits waking up with a > random value. Yea. The way I thought about it originally was that you can set an alarm and that alarm will fire if the machine is on, suspended or even in some cases off. Then, when the machine is booted (system reset), the state of the RTC's alarm should not be trusted. Your description of the AIE/UIE having random values aligns with that intuition. However, if the expectation is that once set, the alarm should persist across any number of reboots, this makes it a bit more complicated. > > 2) One larger complication I see coming down the road with this is how > > do we handle persistence with multiplexed events? If we have two > > rtc_timers set to fire, one at 1pm and the other at 3pm. If we reboot > > the box at noon, only the 1pm timer will persist. > > > > This could cause some additional confusion if the first timer was a > > posix-alarm-timer and the second was the classic wake alarm set > > by /dev/rtc0. In that case, after a reboot at noon, the system will show > > a 1pm wake alarm via /dev/rtc0. > > > > I need to think more about #2. I suspect we could claim that soonest > > alarm should be preserved regardless of what its source was. > > Upon a reboot, I believe its a valid assumption that the system has > been completely reinitialized, as opposed to a suspend. In this case, > none of the original applications that have set alarms will be running > on the system. Setting the alarm to do anything more than waking up > the system seems odd in this scenario. An application that will keep > information across reboots must have other means to persist its > information, most likely keeping it in a file so that it can decide > what to do upon initialization. Then it could check what alarms it > would need to set. Yes. To me this seems like the better design. The alarm can be set to fire while the system is off, but upon a system reset any applications managing such alarms should check data saved in a more trusted persistent store (like a file, instead of in the RTC hardware) and possibly re-initialize the alarm. However, pulling the hardware state and if possible (since apparently much hardware doesn't preserve a valid state through reset) setting the RTC's aie_timer to that state probably isn't a bad idea either. Since its possible that a timer was set prior to reboot, we should atleast keep the kernel's understanding of the hardware state consistent (there may very well be a alarm ticking down, so we should represent that). In other-words, if we can, we might as well save what we can back, but this wouldn't change the fact that upon reset you can't trust hardware to preserve that state. thanks -john ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [rtc-linux] [PATCH 04/10] RTC: Cleanup rtc_class_ops->read_alarm() 2011-02-22 19:35 ` john stultz @ 2011-02-22 19:51 ` Mark Brown 2011-02-22 19:58 ` john stultz 0 siblings, 1 reply; 32+ messages in thread From: Mark Brown @ 2011-02-22 19:51 UTC (permalink / raw) To: john stultz Cc: Marcelo Roberto Jimenez, rtc-linux, LKML, Thomas Gleixner, Alessandro Zummo On Tue, Feb 22, 2011 at 11:35:10AM -0800, john stultz wrote: > Yea. The way I thought about it originally was that you can set an alarm > and that alarm will fire if the machine is on, suspended or even in some > cases off. Then, when the machine is booted (system reset), the state > of the RTC's alarm should not be trusted. > Your description of the AIE/UIE having random values aligns with that > intuition. This seems rather worrying - it sounds like it might mean that the device might come up firing spuriously which doesn't seem terribly clever. > However, if the expectation is that once set, the alarm should persist > across any number of reboots, this makes it a bit more complicated. For an embedded device I'd expect that either nothing about the RTC would persist (including the time) or everything would. ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [rtc-linux] [PATCH 04/10] RTC: Cleanup rtc_class_ops->read_alarm() 2011-02-22 19:51 ` Mark Brown @ 2011-02-22 19:58 ` john stultz 2011-02-22 21:26 ` Marcelo Roberto Jimenez 0 siblings, 1 reply; 32+ messages in thread From: john stultz @ 2011-02-22 19:58 UTC (permalink / raw) To: Mark Brown Cc: Marcelo Roberto Jimenez, rtc-linux, LKML, Thomas Gleixner, Alessandro Zummo On Tue, 2011-02-22 at 19:51 +0000, Mark Brown wrote: > On Tue, Feb 22, 2011 at 11:35:10AM -0800, john stultz wrote: > > > Yea. The way I thought about it originally was that you can set an alarm > > and that alarm will fire if the machine is on, suspended or even in some > > cases off. Then, when the machine is booted (system reset), the state > > of the RTC's alarm should not be trusted. > > > Your description of the AIE/UIE having random values aligns with that > > intuition. > > This seems rather worrying - it sounds like it might mean that the > device might come up firing spuriously which doesn't seem terribly > clever. Well, in those known cases the driver should initalize the irq modes to be off. > > However, if the expectation is that once set, the alarm should persist > > across any number of reboots, this makes it a bit more complicated. > > For an embedded device I'd expect that either nothing about the RTC > would persist (including the time) or everything would. But that isn't the reality of the hardware. On reboot the kernel can't trust hardware to be in a valid state. Even so, we can try to preserve what we can, but I think the expectation from an application's point of view shouldn't be that rtc device's alarm state will be valid upon reset. thanks -john ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [rtc-linux] [PATCH 04/10] RTC: Cleanup rtc_class_ops->read_alarm() 2011-02-22 19:58 ` john stultz @ 2011-02-22 21:26 ` Marcelo Roberto Jimenez 0 siblings, 0 replies; 32+ messages in thread From: Marcelo Roberto Jimenez @ 2011-02-22 21:26 UTC (permalink / raw) To: john stultz Cc: Mark Brown, rtc-linux, LKML, Thomas Gleixner, Alessandro Zummo On Tue, Feb 22, 2011 at 16:58, john stultz <johnstul@us.ibm.com> wrote: > On Tue, 2011-02-22 at 19:51 +0000, Mark Brown wrote: >> On Tue, Feb 22, 2011 at 11:35:10AM -0800, john stultz wrote: >> >> > Yea. The way I thought about it originally was that you can set an alarm >> > and that alarm will fire if the machine is on, suspended or even in some >> > cases off. Then, when the machine is booted (system reset), the state >> > of the RTC's alarm should not be trusted. >> >> > Your description of the AIE/UIE having random values aligns with that >> > intuition. >> >> This seems rather worrying - it sounds like it might mean that the >> device might come up firing spuriously which doesn't seem terribly >> clever. > > Well, in those known cases the driver should initalize the irq modes to > be off. Just a correction to my post, it was not AIE/UIE with ramdom values, it was an alarm or update interrupt pending bit in the status register (RTSR) that woke up set after reboot, even before interrupts were enabled. In this case, the device would wake up with an interrupt pending. The interrupt routine would not clear an interrupt that was not enabled and that lead to an infinite loop of interrupts. Regards, Marcelo. ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [rtc-linux] [PATCH 04/10] RTC: Cleanup rtc_class_ops->read_alarm() 2011-02-22 8:09 ` john stultz 2011-02-22 12:51 ` Marcelo Roberto Jimenez @ 2011-02-22 18:16 ` Mark Brown 2011-02-22 19:51 ` john stultz 2011-02-22 19:53 ` john stultz 1 sibling, 2 replies; 32+ messages in thread From: Mark Brown @ 2011-02-22 18:16 UTC (permalink / raw) To: john stultz Cc: rtc-linux, LKML, Thomas Gleixner, Alessandro Zummo, Marcelo Roberto Jimenez On Tue, Feb 22, 2011 at 12:09:38AM -0800, john stultz wrote: > Just so I can better get a grip of the cases your considering, could you > maybe give me some more detailed examples of where you'd like to see the > alarm timer be set and then persist across multiple power cycles before > firing? And how is that persistent value managed by the application > setting it? The WM83xx RTCs can do this (the alarm can be used to initiate a boot) and I'd expect many embedded RTC controllers can do similar. The application would manage this by owning the RTC in the system, usually with a configuration saying something like "boot every day at 7am" or something. Having thought about this a bit I'm thinking that this sort of alarm handling is probably something I'd expect to see handled in userspace. I can see us providing a virtual RTC driver that can generate alarms when there's no actual RTC hardware but adding additional functionality on top of the hardware feels like an application issue. ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [rtc-linux] [PATCH 04/10] RTC: Cleanup rtc_class_ops->read_alarm() 2011-02-22 18:16 ` Mark Brown @ 2011-02-22 19:51 ` john stultz 2011-02-22 20:00 ` Mark Brown 2011-02-22 19:53 ` john stultz 1 sibling, 1 reply; 32+ messages in thread From: john stultz @ 2011-02-22 19:51 UTC (permalink / raw) To: Mark Brown Cc: rtc-linux, LKML, Thomas Gleixner, Alessandro Zummo, Marcelo Roberto Jimenez On Tue, 2011-02-22 at 10:16 -0800, Mark Brown wrote: > On Tue, Feb 22, 2011 at 12:09:38AM -0800, john stultz wrote: > > > Just so I can better get a grip of the cases your considering, could you > > maybe give me some more detailed examples of where you'd like to see the > > alarm timer be set and then persist across multiple power cycles before > > firing? And how is that persistent value managed by the application > > setting it? > > The WM83xx RTCs can do this (the alarm can be used to initiate a boot) > and I'd expect many embedded RTC controllers can do similar. The > application would manage this by owning the RTC in the system, usually > with a configuration saying something like "boot every day at 7am" or > something. So since the RTC_ALM_SET doesn't support wildcards, the application would be checking the hardware at least once a day and making sure the alarm was properly set for 7am? Does the approach I mentioned in my last mail to Marcelo sound like a reasonable solution? Basically: The kernel will try to init the value returned from RTC_ALM_READ to whatever the hardware has stored, but since many (very common) rtc devices don't support persistent values after reset, applications shouldn't trust that alarms will persist across resets. > Having thought about this a bit I'm thinking that this sort of alarm > handling is probably something I'd expect to see handled in userspace. > I can see us providing a virtual RTC driver that can generate alarms > when there's no actual RTC hardware but adding additional functionality > on top of the hardware feels like an application issue. If you're suggesting that the multiplexing of RTC events doesn't belong in the kernel, and instead should be handled through userland coordination, then I disagree. The kernel's job is explicitly to abstract the hardware so that resources can be shared safely. So abstracting the RTC alarms doesn't seem to be overreaching. But maybe I'm misunderstanding what your saying? thanks john ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [rtc-linux] [PATCH 04/10] RTC: Cleanup rtc_class_ops->read_alarm() 2011-02-22 19:51 ` john stultz @ 2011-02-22 20:00 ` Mark Brown 2011-02-22 20:22 ` john stultz 0 siblings, 1 reply; 32+ messages in thread From: Mark Brown @ 2011-02-22 20:00 UTC (permalink / raw) To: john stultz Cc: rtc-linux, LKML, Thomas Gleixner, Alessandro Zummo, Marcelo Roberto Jimenez On Tue, Feb 22, 2011 at 11:51:08AM -0800, john stultz wrote: > On Tue, 2011-02-22 at 10:16 -0800, Mark Brown wrote: > > The WM83xx RTCs can do this (the alarm can be used to initiate a boot) > > and I'd expect many embedded RTC controllers can do similar. The > > application would manage this by owning the RTC in the system, usually > > with a configuration saying something like "boot every day at 7am" or > > something. > So since the RTC_ALM_SET doesn't support wildcards, the application > would be checking the hardware at least once a day and making sure the > alarm was properly set for 7am? Probably, yes. Though some RTCs just ignore the day anyway. > Does the approach I mentioned in my last mail to Marcelo sound like a > reasonable solution? > Basically: The kernel will try to init the value returned from > RTC_ALM_READ to whatever the hardware has stored, but since many (very > common) rtc devices don't support persistent values after reset, > applications shouldn't trust that alarms will persist across resets. That'll probably work, yes. > > Having thought about this a bit I'm thinking that this sort of alarm > > handling is probably something I'd expect to see handled in userspace. > > I can see us providing a virtual RTC driver that can generate alarms > > when there's no actual RTC hardware but adding additional functionality > > on top of the hardware feels like an application issue. > If you're suggesting that the multiplexing of RTC events doesn't belong > in the kernel, and instead should be handled through userland > coordination, then I disagree. The kernel's job is explicitly to > abstract the hardware so that resources can be shared safely. So > abstracting the RTC alarms doesn't seem to be overreaching. But maybe > I'm misunderstanding what your saying? I'm saying that for something like this it doesn't seem like the kernel should be adding support for features that the hardware doesn't actually have, it feels like it's going to be more complicated and error prone to implement in kernel space. ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [rtc-linux] [PATCH 04/10] RTC: Cleanup rtc_class_ops->read_alarm() 2011-02-22 20:00 ` Mark Brown @ 2011-02-22 20:22 ` john stultz 2011-02-22 21:05 ` Mark Brown 0 siblings, 1 reply; 32+ messages in thread From: john stultz @ 2011-02-22 20:22 UTC (permalink / raw) To: Mark Brown Cc: rtc-linux, LKML, Thomas Gleixner, Alessandro Zummo, Marcelo Roberto Jimenez On Tue, 2011-02-22 at 20:00 +0000, Mark Brown wrote: > On Tue, Feb 22, 2011 at 11:51:08AM -0800, john stultz wrote: > > On Tue, 2011-02-22 at 10:16 -0800, Mark Brown wrote: > > > > The WM83xx RTCs can do this (the alarm can be used to initiate a boot) > > > and I'd expect many embedded RTC controllers can do similar. The > > > application would manage this by owning the RTC in the system, usually > > > with a configuration saying something like "boot every day at 7am" or > > > something. > > > So since the RTC_ALM_SET doesn't support wildcards, the application > > would be checking the hardware at least once a day and making sure the > > alarm was properly set for 7am? > > Probably, yes. Though some RTCs just ignore the day anyway. > > > Does the approach I mentioned in my last mail to Marcelo sound like a > > reasonable solution? > > > Basically: The kernel will try to init the value returned from > > RTC_ALM_READ to whatever the hardware has stored, but since many (very > > common) rtc devices don't support persistent values after reset, > > applications shouldn't trust that alarms will persist across resets. > > That'll probably work, yes. Good to hear! Thanks again for bringing this issue up. > > > Having thought about this a bit I'm thinking that this sort of alarm > > > handling is probably something I'd expect to see handled in userspace. > > > I can see us providing a virtual RTC driver that can generate alarms > > > when there's no actual RTC hardware but adding additional functionality > > > on top of the hardware feels like an application issue. > > > If you're suggesting that the multiplexing of RTC events doesn't belong > > in the kernel, and instead should be handled through userland > > coordination, then I disagree. The kernel's job is explicitly to > > abstract the hardware so that resources can be shared safely. So > > abstracting the RTC alarms doesn't seem to be overreaching. But maybe > > I'm misunderstanding what your saying? > > I'm saying that for something like this it doesn't seem like the kernel > should be adding support for features that the hardware doesn't actually > have, it feels like it's going to be more complicated and error prone to > implement in kernel space. So yes, its a little split here. On one hand, if the hardware doesn't support alarms, we don't pretend it does. On the other, we have to preserve the existing behavior, so some things had to be emulated. For example, I wouldn't have exposed the periodic irq mode to userland. It simply duplicates existing functionality in the kernel (ie: periodic timers). But since it has been exposed, to keep compatibility I ended up emulating it using the kernel functionality it duplicates. In some ways it does complicate things, but in others it greatly simplifies it. You don't have to have 80 drivers each implementing their own code to set a mode that isn't used. Everyone is using the common kernel code, so bugs are shared and thus found and fixed faster. Features can be more easily added, as the limitations of specific hardware have to be more formally expressed, rather then having to change 80 drivers that opaquely work around their specific hardware issues. Also, applications are easier to port, since there are less platform specific differences. I do agree that its not always optimal, but sometimes it is necessary if we want to overcome the limits of earlier design decisions without breaking applications. thanks -john ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [rtc-linux] [PATCH 04/10] RTC: Cleanup rtc_class_ops->read_alarm() 2011-02-22 20:22 ` john stultz @ 2011-02-22 21:05 ` Mark Brown 2011-02-22 21:21 ` john stultz 0 siblings, 1 reply; 32+ messages in thread From: Mark Brown @ 2011-02-22 21:05 UTC (permalink / raw) To: john stultz Cc: rtc-linux, LKML, Thomas Gleixner, Alessandro Zummo, Marcelo Roberto Jimenez On Tue, Feb 22, 2011 at 12:22:54PM -0800, john stultz wrote: > In some ways it does complicate things, but in others it greatly > simplifies it. You don't have to have 80 drivers each implementing their > own code to set a mode that isn't used. Everyone is using the common > kernel code, so bugs are shared and thus found and fixed faster. > Features can be more easily added, as the limitations of specific > hardware have to be more formally expressed, rather then having to > change 80 drivers that opaquely work around their specific hardware > issues. Also, applications are easier to port, since there are less > platform specific differences. I agree that it's a win for things like UIE - the reason it worries me for alarms (and the RTC time itself) is that full emulation requires us to do things over reboots, including the support for having multiple alarms scheduled which isn't available on most hardware at all. ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [rtc-linux] [PATCH 04/10] RTC: Cleanup rtc_class_ops->read_alarm() 2011-02-22 21:05 ` Mark Brown @ 2011-02-22 21:21 ` john stultz 2011-02-22 21:27 ` Thomas Gleixner 2011-02-22 21:33 ` Mark Brown 0 siblings, 2 replies; 32+ messages in thread From: john stultz @ 2011-02-22 21:21 UTC (permalink / raw) To: Mark Brown Cc: rtc-linux, LKML, Thomas Gleixner, Alessandro Zummo, Marcelo Roberto Jimenez On Tue, 2011-02-22 at 21:05 +0000, Mark Brown wrote: > On Tue, Feb 22, 2011 at 12:22:54PM -0800, john stultz wrote: > > > In some ways it does complicate things, but in others it greatly > > simplifies it. You don't have to have 80 drivers each implementing their > > own code to set a mode that isn't used. Everyone is using the common > > kernel code, so bugs are shared and thus found and fixed faster. > > Features can be more easily added, as the limitations of specific > > hardware have to be more formally expressed, rather then having to > > change 80 drivers that opaquely work around their specific hardware > > issues. Also, applications are easier to port, since there are less > > platform specific differences. > > I agree that it's a win for things like UIE - the reason it worries me > for alarms (and the RTC time itself) is that full emulation requires us > to do things over reboots, including the support for having multiple > alarms scheduled which isn't available on most hardware at all. Hmm. Maybe I'm missing what you mean again. If the RTC doesn't support alarms, we don't emulate them (or RTC time). But if you just mean trying to keep multiple alarms scheduled across resets, I don't think that is something we can emulate (since the kernel doesn't have any other persistent storage). But due to the lack of consistency in RTC hardware, I don't think its a reasonable expectation for applications to have. We can preserve what hardware state we can at boot, but applications should not expect alarms set multiple reboot cycles ago to be valid. After all, other applications might have jumped in and grabbed the rtc device and set it to something else before the application was able to. Or a user might change the value from something like a bios menu. thanks -john ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [rtc-linux] [PATCH 04/10] RTC: Cleanup rtc_class_ops->read_alarm() 2011-02-22 21:21 ` john stultz @ 2011-02-22 21:27 ` Thomas Gleixner 2011-02-22 21:40 ` Mark Brown 2011-02-22 21:33 ` Mark Brown 1 sibling, 1 reply; 32+ messages in thread From: Thomas Gleixner @ 2011-02-22 21:27 UTC (permalink / raw) To: john stultz Cc: Mark Brown, rtc-linux, LKML, Alessandro Zummo, Marcelo Roberto Jimenez On Tue, 22 Feb 2011, john stultz wrote: > On Tue, 2011-02-22 at 21:05 +0000, Mark Brown wrote: > > On Tue, Feb 22, 2011 at 12:22:54PM -0800, john stultz wrote: > > > > > In some ways it does complicate things, but in others it greatly > > > simplifies it. You don't have to have 80 drivers each implementing their > > > own code to set a mode that isn't used. Everyone is using the common > > > kernel code, so bugs are shared and thus found and fixed faster. > > > Features can be more easily added, as the limitations of specific > > > hardware have to be more formally expressed, rather then having to > > > change 80 drivers that opaquely work around their specific hardware > > > issues. Also, applications are easier to port, since there are less > > > platform specific differences. > > > > I agree that it's a win for things like UIE - the reason it worries me > > for alarms (and the RTC time itself) is that full emulation requires us > > to do things over reboots, including the support for having multiple > > alarms scheduled which isn't available on most hardware at all. > > Hmm. Maybe I'm missing what you mean again. If the RTC doesn't support > alarms, we don't emulate them (or RTC time). > > But if you just mean trying to keep multiple alarms scheduled across > resets, I don't think that is something we can emulate (since the kernel > doesn't have any other persistent storage). But due to the lack of > consistency in RTC hardware, I don't think its a reasonable expectation > for applications to have. > > We can preserve what hardware state we can at boot, but applications > should not expect alarms set multiple reboot cycles ago to be valid. > After all, other applications might have jumped in and grabbed the rtc > device and set it to something else before the application was able to. > Or a user might change the value from something like a bios menu. Ack. Anyhting which relies on such a feature is broken by definition. A sane requirement is that the last set earliest alarm survives, but anything else is just beyond the scope of a sane interface. Thanks, tglx ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [rtc-linux] [PATCH 04/10] RTC: Cleanup rtc_class_ops->read_alarm() 2011-02-22 21:27 ` Thomas Gleixner @ 2011-02-22 21:40 ` Mark Brown 0 siblings, 0 replies; 32+ messages in thread From: Mark Brown @ 2011-02-22 21:40 UTC (permalink / raw) To: Thomas Gleixner Cc: john stultz, rtc-linux, LKML, Alessandro Zummo, Marcelo Roberto Jimenez On Tue, Feb 22, 2011 at 10:27:12PM +0100, Thomas Gleixner wrote: > On Tue, 22 Feb 2011, john stultz wrote: > > We can preserve what hardware state we can at boot, but applications > > should not expect alarms set multiple reboot cycles ago to be valid. > > After all, other applications might have jumped in and grabbed the rtc > > device and set it to something else before the application was able to. > > Or a user might change the value from something like a bios menu. > Ack. Anyhting which relies on such a feature is broken by > definition. A sane requirement is that the last set earliest alarm > survives, but anything else is just beyond the scope of a sane > interface. Right, my point is that it doesn't strike me as obvious that we should be supporting multiple alarms on an RTC in kernel space in the first place (unless someone comes up with hardware which does so). ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [rtc-linux] [PATCH 04/10] RTC: Cleanup rtc_class_ops->read_alarm() 2011-02-22 21:21 ` john stultz 2011-02-22 21:27 ` Thomas Gleixner @ 2011-02-22 21:33 ` Mark Brown 2011-02-22 22:10 ` john stultz 1 sibling, 1 reply; 32+ messages in thread From: Mark Brown @ 2011-02-22 21:33 UTC (permalink / raw) To: john stultz Cc: rtc-linux, LKML, Thomas Gleixner, Alessandro Zummo, Marcelo Roberto Jimenez On Tue, Feb 22, 2011 at 01:21:13PM -0800, john stultz wrote: > But if you just mean trying to keep multiple alarms scheduled across > resets, I don't think that is something we can emulate (since the kernel > doesn't have any other persistent storage). But due to the lack of > consistency in RTC hardware, I don't think its a reasonable expectation > for applications to have. I'm saying that I've got concerns about providing that functionality at all as it's going to be a pure software at runtime thing - the kernel can't do anything here that userspace couldn't already do and there are things that userspace can do that the kernel can't. If the hardware could do it then great but otherwise it feels like you'd be better off with a program in userspace owning the hardware and dealing with the resource contention. ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [rtc-linux] [PATCH 04/10] RTC: Cleanup rtc_class_ops->read_alarm() 2011-02-22 21:33 ` Mark Brown @ 2011-02-22 22:10 ` john stultz 2011-02-22 23:07 ` Mark Brown 0 siblings, 1 reply; 32+ messages in thread From: john stultz @ 2011-02-22 22:10 UTC (permalink / raw) To: Mark Brown Cc: rtc-linux, LKML, Thomas Gleixner, Alessandro Zummo, Marcelo Roberto Jimenez On Tue, 2011-02-22 at 21:33 +0000, Mark Brown wrote: > On Tue, Feb 22, 2011 at 01:21:13PM -0800, john stultz wrote: > > > But if you just mean trying to keep multiple alarms scheduled across > > resets, I don't think that is something we can emulate (since the kernel > > doesn't have any other persistent storage). But due to the lack of > > consistency in RTC hardware, I don't think its a reasonable expectation > > for applications to have. > > I'm saying that I've got concerns about providing that functionality at > all as it's going to be a pure software at runtime thing - the kernel > can't do anything here that userspace couldn't already do and there are > things that userspace can do that the kernel can't. If the hardware > could do it then great but otherwise it feels like you'd be better off > with a program in userspace owning the hardware and dealing with the > resource contention. So to be sure I understand: the concern is that because the kernel can't keep a persistent list of events across resets, while userland can (via a file), it would be better to do multiplexing of alarm events via userland coordination (maybe having something like a daemon that "owns" the RTC device and handles events over dbus or something) instead of in the kernel. It is an interesting point. And that would avoid the loss of the event list across a system restart. Although For me, I see multiplexing events becoming too useful a bit of functionality to offload to a userland API. Especially since there might be conflicting approaches to the userland coordination (Want to open a file? There's one call you have to make. Want to draw a on the screen? Well, there's X or fb or maybe wayland, etc). Further, because the existing interface isn't sharable, any legacy application that requires the RTC could block the usage by any new userland coordination framework. Similarly if the coordination framework is being used, the legacy applications cannot function. Should there be competing userland coordination frameworks, then the would be exclusive and apps that used one wouldn't work on the other. The benefit to the in-kernel approach is that it provides the addtional functionality, but it also preserves the legacy interface. And even better, it doesn't prevent such a userland-coordination method to be used either (the legacy interface, or even via new interfaces like the posix alarm timers). Now, your observation about the behavior of persistence over reboots is a interesting corner-case that I overlooked. And I do want to address that as best we can, but I think it is an unreasonable expectation for applications to have, given that much common hardware doesn't support it. thanks -john ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [rtc-linux] [PATCH 04/10] RTC: Cleanup rtc_class_ops->read_alarm() 2011-02-22 22:10 ` john stultz @ 2011-02-22 23:07 ` Mark Brown 0 siblings, 0 replies; 32+ messages in thread From: Mark Brown @ 2011-02-22 23:07 UTC (permalink / raw) To: john stultz Cc: rtc-linux, LKML, Thomas Gleixner, Alessandro Zummo, Marcelo Roberto Jimenez On Tue, Feb 22, 2011 at 02:10:34PM -0800, john stultz wrote: > Although For me, I see multiplexing events becoming too useful a bit of > functionality to offload to a userland API. Especially since there might > be conflicting approaches to the userland coordination (Want to open a > file? There's one call you have to make. Want to draw a on the screen? > Well, there's X or fb or maybe wayland, etc). Of course one can equally make the argument that this sort of multiplexing decision is policy and the multiple independant ideas for how it should work suggests we shouldn't be picking something for them. I don't feel *that* strongly about it, though. > Now, your observation about the behavior of persistence over reboots is > a interesting corner-case that I overlooked. And I do want to address > that as best we can, but I think it is an unreasonable expectation for > applications to have, given that much common hardware doesn't support > it. What would probably help here if we're going to keep this support in would be to make the current state and perhaps also the underlying hardware features more discoverable. That way userspace can preserve the state when shutting down if it wants to. ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [rtc-linux] [PATCH 04/10] RTC: Cleanup rtc_class_ops->read_alarm() 2011-02-22 18:16 ` Mark Brown 2011-02-22 19:51 ` john stultz @ 2011-02-22 19:53 ` john stultz 2011-02-22 20:31 ` Mark Brown 1 sibling, 1 reply; 32+ messages in thread From: john stultz @ 2011-02-22 19:53 UTC (permalink / raw) To: Mark Brown Cc: rtc-linux, LKML, Thomas Gleixner, Alessandro Zummo, Marcelo Roberto Jimenez On Tue, 2011-02-22 at 10:16 -0800, Mark Brown wrote: > On Tue, Feb 22, 2011 at 12:09:38AM -0800, john stultz wrote: > > > Just so I can better get a grip of the cases your considering, could you > > maybe give me some more detailed examples of where you'd like to see the > > alarm timer be set and then persist across multiple power cycles before > > firing? And how is that persistent value managed by the application > > setting it? > > The WM83xx RTCs can do this (the alarm can be used to initiate a boot) > and I'd expect many embedded RTC controllers can do similar. Oh, and would you be able to test the possible solution I have for this? Since the hardware I have doesn't support alarm persistence across reset, I'm limited in being able to validate the patch's correctness. thanks -john ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [rtc-linux] [PATCH 04/10] RTC: Cleanup rtc_class_ops->read_alarm() 2011-02-22 19:53 ` john stultz @ 2011-02-22 20:31 ` Mark Brown 0 siblings, 0 replies; 32+ messages in thread From: Mark Brown @ 2011-02-22 20:31 UTC (permalink / raw) To: john stultz Cc: rtc-linux, LKML, Thomas Gleixner, Alessandro Zummo, Marcelo Roberto Jimenez On Tue, Feb 22, 2011 at 11:53:19AM -0800, john stultz wrote: > On Tue, 2011-02-22 at 10:16 -0800, Mark Brown wrote: > > The WM83xx RTCs can do this (the alarm can be used to initiate a boot) > > and I'd expect many embedded RTC controllers can do similar. > Oh, and would you be able to test the possible solution I have for this? > Since the hardware I have doesn't support alarm persistence across > reset, I'm limited in being able to validate the patch's correctness. I should be able to I think, I'll need to check that I've got a board which can go down to full power off without cutting the RTC supply but I'm pretty sure I do. ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 05/10] RTC: Clean out UIE icotl implementations 2011-02-21 23:55 [PATCH 00/10] [RFC] RTC: Cleanups for 2.6.39 John Stultz ` (3 preceding siblings ...) 2011-02-21 23:55 ` [PATCH 04/10] RTC: Cleanup rtc_class_ops->read_alarm() John Stultz @ 2011-02-21 23:55 ` John Stultz 2011-02-21 23:55 ` [PATCH 06/10] RTC: Include information about UIE and PIE in RTC driver proc John Stultz ` (4 subsequent siblings) 9 siblings, 0 replies; 32+ messages in thread From: John Stultz @ 2011-02-21 23:55 UTC (permalink / raw) To: LKML Cc: John Stultz, Thomas Gleixner, Alessandro Zummo, Marcelo Roberto Jimenez, rtc-linux With the generic RTC rework, the UIE mode irqs are handled in the generic layer, and only hardware specific ioctls get passed down to the rtc driver layer. So this patch removes the UIE mode ioctl handling in the rtc driver layer, which never get used. CC: Thomas Gleixner <tglx@linutronix.de> CC: Alessandro Zummo <a.zummo@towertech.it> CC: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br> CC: rtc-linux@googlegroups.com Signed-off-by: John Stultz <john.stultz@linaro.org> --- drivers/rtc/rtc-at91rm9200.c | 28 ---------------------- drivers/rtc/rtc-at91sam9.c | 28 ---------------------- drivers/rtc/rtc-bfin.c | 27 --------------------- drivers/rtc/rtc-davinci.c | 4 --- drivers/rtc/rtc-omap.c | 39 ------------------------------- drivers/rtc/rtc-pl030.c | 6 ----- drivers/rtc/rtc-rs5c372.c | 52 ------------------------------------------ drivers/rtc/rtc-sa1100.c | 19 --------------- drivers/rtc/rtc-sh.c | 22 ----------------- 9 files changed, 0 insertions(+), 225 deletions(-) diff --git a/drivers/rtc/rtc-at91rm9200.c b/drivers/rtc/rtc-at91rm9200.c index 30a48ac..0b35d7c 100644 --- a/drivers/rtc/rtc-at91rm9200.c +++ b/drivers/rtc/rtc-at91rm9200.c @@ -162,33 +162,6 @@ static int at91_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) return 0; } -/* - * Handle commands from user-space - */ -static int at91_rtc_ioctl(struct device *dev, unsigned int cmd, - unsigned long arg) -{ - int ret = 0; - - pr_debug("%s(): cmd=%08x, arg=%08lx.\n", __func__, cmd, arg); - - /* important: scrub old status before enabling IRQs */ - switch (cmd) { - case RTC_UIE_OFF: /* update off */ - at91_sys_write(AT91_RTC_IDR, AT91_RTC_SECEV); - break; - case RTC_UIE_ON: /* update on */ - at91_sys_write(AT91_RTC_SCCR, AT91_RTC_SECEV); - at91_sys_write(AT91_RTC_IER, AT91_RTC_SECEV); - break; - default: - ret = -ENOIOCTLCMD; - break; - } - - return ret; -} - static int at91_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) { pr_debug("%s(): cmd=%08x\n", __func__, enabled); @@ -248,7 +221,6 @@ static irqreturn_t at91_rtc_interrupt(int irq, void *dev_id) } static const struct rtc_class_ops at91_rtc_ops = { - .ioctl = at91_rtc_ioctl, .read_time = at91_rtc_readtime, .set_time = at91_rtc_settime, .set_alarm = at91_rtc_setalarm, diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c index 8d954bf..a30056b 100644 --- a/drivers/rtc/rtc-at91sam9.c +++ b/drivers/rtc/rtc-at91sam9.c @@ -190,33 +190,6 @@ static int at91_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) return 0; } -/* - * Handle commands from user-space - */ -static int at91_rtc_ioctl(struct device *dev, unsigned int cmd, - unsigned long arg) -{ - struct sam9_rtc *rtc = dev_get_drvdata(dev); - int ret = 0; - u32 mr = rtt_readl(rtc, MR); - - dev_dbg(dev, "ioctl: cmd=%08x, arg=%08lx, mr %08x\n", cmd, arg, mr); - - switch (cmd) { - case RTC_UIE_OFF: /* update off */ - rtt_writel(rtc, MR, mr & ~AT91_RTT_RTTINCIEN); - break; - case RTC_UIE_ON: /* update on */ - rtt_writel(rtc, MR, mr | AT91_RTT_RTTINCIEN); - break; - default: - ret = -ENOIOCTLCMD; - break; - } - - return ret; -} - static int at91_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) { struct sam9_rtc *rtc = dev_get_drvdata(dev); @@ -277,7 +250,6 @@ static irqreturn_t at91_rtc_interrupt(int irq, void *_rtc) } static const struct rtc_class_ops at91_rtc_ops = { - .ioctl = at91_rtc_ioctl, .read_time = at91_rtc_readtime, .set_time = at91_rtc_settime, .set_alarm = at91_rtc_setalarm, diff --git a/drivers/rtc/rtc-bfin.c b/drivers/rtc/rtc-bfin.c index 9b846e4..f08499e 100644 --- a/drivers/rtc/rtc-bfin.c +++ b/drivers/rtc/rtc-bfin.c @@ -240,32 +240,6 @@ static void bfin_rtc_int_set_alarm(struct bfin_rtc *rtc) */ bfin_rtc_int_set(rtc->rtc_alarm.tm_yday == -1 ? RTC_ISTAT_ALARM : RTC_ISTAT_ALARM_DAY); } -static int bfin_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg) -{ - struct bfin_rtc *rtc = dev_get_drvdata(dev); - int ret = 0; - - dev_dbg_stamp(dev); - - bfin_rtc_sync_pending(dev); - - switch (cmd) { - case RTC_UIE_ON: - dev_dbg_stamp(dev); - bfin_rtc_int_set(RTC_ISTAT_SEC); - break; - case RTC_UIE_OFF: - dev_dbg_stamp(dev); - bfin_rtc_int_clear(~RTC_ISTAT_SEC); - break; - - default: - dev_dbg_stamp(dev); - ret = -ENOIOCTLCMD; - } - - return ret; -} static int bfin_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) { @@ -348,7 +322,6 @@ static int bfin_rtc_proc(struct device *dev, struct seq_file *seq) } static struct rtc_class_ops bfin_rtc_ops = { - .ioctl = bfin_rtc_ioctl, .read_time = bfin_rtc_read_time, .set_time = bfin_rtc_set_time, .set_alarm = bfin_rtc_set_alarm, diff --git a/drivers/rtc/rtc-davinci.c b/drivers/rtc/rtc-davinci.c index 1fce4e0..5de0f01 100644 --- a/drivers/rtc/rtc-davinci.c +++ b/drivers/rtc/rtc-davinci.c @@ -231,10 +231,6 @@ davinci_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg) case RTC_WIE_OFF: rtc_ctrl &= ~PRTCSS_RTC_CTRL_WEN; break; - case RTC_UIE_OFF: - case RTC_UIE_ON: - ret = -ENOTTY; - break; default: ret = -ENOIOCTLCMD; } diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c index 7e03835..923f34f 100644 --- a/drivers/rtc/rtc-omap.c +++ b/drivers/rtc/rtc-omap.c @@ -135,44 +135,6 @@ static irqreturn_t rtc_irq(int irq, void *rtc) return IRQ_HANDLED; } -#ifdef CONFIG_RTC_INTF_DEV - -static int -omap_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg) -{ - u8 reg; - - switch (cmd) { - case RTC_UIE_OFF: - case RTC_UIE_ON: - break; - default: - return -ENOIOCTLCMD; - } - - local_irq_disable(); - rtc_wait_not_busy(); - reg = rtc_read(OMAP_RTC_INTERRUPTS_REG); - switch (cmd) { - /* UIE = Update Interrupt Enable (1/second) */ - case RTC_UIE_OFF: - reg &= ~OMAP_RTC_INTERRUPTS_IT_TIMER; - break; - case RTC_UIE_ON: - reg |= OMAP_RTC_INTERRUPTS_IT_TIMER; - break; - } - rtc_wait_not_busy(); - rtc_write(reg, OMAP_RTC_INTERRUPTS_REG); - local_irq_enable(); - - return 0; -} - -#else -#define omap_rtc_ioctl NULL -#endif - static int omap_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) { u8 reg; @@ -292,7 +254,6 @@ static int omap_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm) } static struct rtc_class_ops omap_rtc_ops = { - .ioctl = omap_rtc_ioctl, .read_time = omap_rtc_read_time, .set_time = omap_rtc_set_time, .set_alarm = omap_rtc_set_alarm, diff --git a/drivers/rtc/rtc-pl030.c b/drivers/rtc/rtc-pl030.c index e7d982f..71b8ce6 100644 --- a/drivers/rtc/rtc-pl030.c +++ b/drivers/rtc/rtc-pl030.c @@ -35,11 +35,6 @@ static irqreturn_t pl030_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } -static int pl030_ioctl(struct device *dev, unsigned int cmd, unsigned long arg) -{ - return -ENOIOCTLCMD; -} - static int pl030_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) { struct pl030_rtc *rtc = dev_get_drvdata(dev); @@ -88,7 +83,6 @@ static int pl030_set_time(struct device *dev, struct rtc_time *tm) } static const struct rtc_class_ops pl030_ops = { - .ioctl = pl030_ioctl, .read_time = pl030_read_time, .set_time = pl030_set_time, .set_alarm = pl030_set_alarm, diff --git a/drivers/rtc/rtc-rs5c372.c b/drivers/rtc/rtc-rs5c372.c index ac1e57f..470de78 100644 --- a/drivers/rtc/rtc-rs5c372.c +++ b/drivers/rtc/rtc-rs5c372.c @@ -281,57 +281,6 @@ static int rs5c372_rtc_set_time(struct device *dev, struct rtc_time *tm) return rs5c372_set_datetime(to_i2c_client(dev), tm); } -#if defined(CONFIG_RTC_INTF_DEV) || defined(CONFIG_RTC_INTF_DEV_MODULE) - -static int -rs5c_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg) -{ - struct i2c_client *client = to_i2c_client(dev); - struct rs5c372 *rs5c = i2c_get_clientdata(client); - unsigned char buf; - int status, addr; - - buf = rs5c->regs[RS5C_REG_CTRL1]; - switch (cmd) { - case RTC_UIE_OFF: - case RTC_UIE_ON: - /* some 327a modes use a different IRQ pin for 1Hz irqs */ - if (rs5c->type == rtc_rs5c372a - && (buf & RS5C372A_CTRL1_SL1)) - return -ENOIOCTLCMD; - default: - return -ENOIOCTLCMD; - } - - status = rs5c_get_regs(rs5c); - if (status < 0) - return status; - - addr = RS5C_ADDR(RS5C_REG_CTRL1); - switch (cmd) { - case RTC_UIE_OFF: /* update off */ - buf &= ~RS5C_CTRL1_CT_MASK; - break; - case RTC_UIE_ON: /* update on */ - buf &= ~RS5C_CTRL1_CT_MASK; - buf |= RS5C_CTRL1_CT4; - break; - } - - if (i2c_smbus_write_byte_data(client, addr, buf) < 0) { - printk(KERN_WARNING "%s: can't update alarm\n", - rs5c->rtc->name); - status = -EIO; - } else - rs5c->regs[RS5C_REG_CTRL1] = buf; - - return status; -} - -#else -#define rs5c_rtc_ioctl NULL -#endif - static int rs5c_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) { @@ -443,7 +392,6 @@ static int rs5c372_rtc_proc(struct device *dev, struct seq_file *seq) static const struct rtc_class_ops rs5c372_rtc_ops = { .proc = rs5c372_rtc_proc, - .ioctl = rs5c_rtc_ioctl, .read_time = rs5c372_rtc_read_time, .set_time = rs5c372_rtc_set_time, .set_alarm = rs5c_set_alarm, diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c index df1804f..e52e1f5 100644 --- a/drivers/rtc/rtc-sa1100.c +++ b/drivers/rtc/rtc-sa1100.c @@ -293,24 +293,6 @@ static void sa1100_rtc_release(struct device *dev) } -static int sa1100_rtc_ioctl(struct device *dev, unsigned int cmd, - unsigned long arg) -{ - switch (cmd) { - case RTC_UIE_OFF: - spin_lock_irq(&sa1100_rtc_lock); - RTSR &= ~RTSR_HZE; - spin_unlock_irq(&sa1100_rtc_lock); - return 0; - case RTC_UIE_ON: - spin_lock_irq(&sa1100_rtc_lock); - RTSR |= RTSR_HZE; - spin_unlock_irq(&sa1100_rtc_lock); - return 0; - } - return -ENOIOCTLCMD; -} - static int sa1100_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) { spin_lock_irq(&sa1100_rtc_lock); @@ -375,7 +357,6 @@ static const struct rtc_class_ops sa1100_rtc_ops = { .open = sa1100_rtc_open, .read_callback = sa1100_rtc_read_callback, .release = sa1100_rtc_release, - .ioctl = sa1100_rtc_ioctl, .read_time = sa1100_rtc_read_time, .set_time = sa1100_rtc_set_time, .set_alarm = sa1100_rtc_set_alarm, diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c index 956c6fb..427d907 100644 --- a/drivers/rtc/rtc-sh.c +++ b/drivers/rtc/rtc-sh.c @@ -344,27 +344,6 @@ static inline void sh_rtc_setcie(struct device *dev, unsigned int enable) spin_unlock_irq(&rtc->lock); } -static int sh_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg) -{ - struct sh_rtc *rtc = dev_get_drvdata(dev); - unsigned int ret = 0; - - switch (cmd) { - case RTC_UIE_OFF: - rtc->periodic_freq &= ~PF_OXS; - sh_rtc_setcie(dev, 0); - break; - case RTC_UIE_ON: - rtc->periodic_freq |= PF_OXS; - sh_rtc_setcie(dev, 1); - break; - default: - ret = -ENOIOCTLCMD; - } - - return ret; -} - static int sh_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) { sh_rtc_setaie(dev, enabled); @@ -559,7 +538,6 @@ static int sh_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *wkalrm) } static struct rtc_class_ops sh_rtc_ops = { - .ioctl = sh_rtc_ioctl, .read_time = sh_rtc_read_time, .set_time = sh_rtc_set_time, .set_alarm = sh_rtc_set_alarm, -- 1.7.3.2.146.gca209 ^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH 06/10] RTC: Include information about UIE and PIE in RTC driver proc. 2011-02-21 23:55 [PATCH 00/10] [RFC] RTC: Cleanups for 2.6.39 John Stultz ` (4 preceding siblings ...) 2011-02-21 23:55 ` [PATCH 05/10] RTC: Clean out UIE icotl implementations John Stultz @ 2011-02-21 23:55 ` John Stultz 2011-02-21 23:55 ` [PATCH 07/10] RTC: Remove UIE and PIE information from the sa1100 " John Stultz ` (3 subsequent siblings) 9 siblings, 0 replies; 32+ messages in thread From: John Stultz @ 2011-02-21 23:55 UTC (permalink / raw) To: LKML Cc: Marcelo Roberto Jimenez, Thomas Gleixner, Alessandro Zummo, rtc-linux, John Stultz From: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br> Generic RTC code is always able to provide the necessary information about update and periodic interrupts. This patch add such information to the proc interface. CC: Thomas Gleixner <tglx@linutronix.de> CC: Alessandro Zummo <a.zummo@towertech.it> CC: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br> CC: rtc-linux@googlegroups.com Signed-off-by: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br> Signed-off-by: John Stultz <john.stultz@linaro.org> --- drivers/rtc/rtc-proc.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/drivers/rtc/rtc-proc.c b/drivers/rtc/rtc-proc.c index 242bbf8..0a59fda 100644 --- a/drivers/rtc/rtc-proc.c +++ b/drivers/rtc/rtc-proc.c @@ -69,6 +69,14 @@ static int rtc_proc_show(struct seq_file *seq, void *offset) alrm.enabled ? "yes" : "no"); seq_printf(seq, "alrm_pending\t: %s\n", alrm.pending ? "yes" : "no"); + seq_printf(seq, "update IRQ enabled\t: %s\n", + (rtc->uie_rtctimer.enabled) ? "yes" : "no"); + seq_printf(seq, "periodic IRQ enabled\t: %s\n", + (rtc->pie_enabled) ? "yes" : "no"); + seq_printf(seq, "periodic IRQ frequency\t: %d\n", + rtc->irq_freq); + seq_printf(seq, "max user IRQ frequency\t: %d\n", + rtc->max_user_freq); } seq_printf(seq, "24hr\t\t: yes\n"); -- 1.7.3.2.146.gca209 ^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH 07/10] RTC: Remove UIE and PIE information from the sa1100 driver proc. 2011-02-21 23:55 [PATCH 00/10] [RFC] RTC: Cleanups for 2.6.39 John Stultz ` (5 preceding siblings ...) 2011-02-21 23:55 ` [PATCH 06/10] RTC: Include information about UIE and PIE in RTC driver proc John Stultz @ 2011-02-21 23:55 ` John Stultz 2011-02-21 23:55 ` [PATCH 08/10] RTC: Fix the cross interrupt issue on rtc-test John Stultz ` (2 subsequent siblings) 9 siblings, 0 replies; 32+ messages in thread From: John Stultz @ 2011-02-21 23:55 UTC (permalink / raw) To: LKML Cc: Marcelo Roberto Jimenez, Thomas Gleixner, Alessandro Zummo, rtc-linux, John Stultz From: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br> This patch removes the UIE and PIE information that is now being supplied directly in the generic RTC code. CC: Thomas Gleixner <tglx@linutronix.de> CC: Alessandro Zummo <a.zummo@towertech.it> CC: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br> CC: rtc-linux@googlegroups.com Signed-off-by: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br> Signed-off-by: John Stultz <john.stultz@linaro.org> --- drivers/rtc/rtc-sa1100.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c index e52e1f5..9ece7be 100644 --- a/drivers/rtc/rtc-sa1100.c +++ b/drivers/rtc/rtc-sa1100.c @@ -340,15 +340,8 @@ static int sa1100_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) static int sa1100_rtc_proc(struct device *dev, struct seq_file *seq) { - struct rtc_device *rtc = (struct rtc_device *)dev; - - seq_printf(seq, "trim/divider\t: 0x%08x\n", (u32) RTTR); - seq_printf(seq, "update_IRQ\t: %s\n", - (RTSR & RTSR_HZE) ? "yes" : "no"); - seq_printf(seq, "periodic_IRQ\t: %s\n", - (OIER & OIER_E1) ? "yes" : "no"); - seq_printf(seq, "periodic_freq\t: %d\n", rtc->irq_freq); - seq_printf(seq, "RTSR\t\t: 0x%08x\n", (u32)RTSR); + seq_printf(seq, "trim/divider\t\t: 0x%08x\n", (u32) RTTR); + seq_printf(seq, "RTSR\t\t\t: 0x%08x\n", (u32)RTSR); return 0; } -- 1.7.3.2.146.gca209 ^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH 08/10] RTC: Fix the cross interrupt issue on rtc-test. 2011-02-21 23:55 [PATCH 00/10] [RFC] RTC: Cleanups for 2.6.39 John Stultz ` (6 preceding siblings ...) 2011-02-21 23:55 ` [PATCH 07/10] RTC: Remove UIE and PIE information from the sa1100 " John Stultz @ 2011-02-21 23:55 ` John Stultz 2011-02-21 23:55 ` [PATCH 09/10] RTC: sa1100: Update the sa1100 RTC driver John Stultz 2011-02-21 23:55 ` [PATCH 10/10] RTC: Fix up rtc.txt documentation to reflect changes to generic rtc layer John Stultz 9 siblings, 0 replies; 32+ messages in thread From: John Stultz @ 2011-02-21 23:55 UTC (permalink / raw) To: LKML Cc: Marcelo Roberto Jimenez, Thomas Gleixner, Alessandro Zummo, rtc-linux, John Stultz From: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br> The rtc-test driver is meant to provide a test/debug code for the RTC subsystem. The rtc-test driver simulates specific interrupts by echoing to the sys interface. Those were the update, alarm and periodic interrupts. As a side effect of the new implementation, any interrupt generated in the rtc-test driver would trigger the same code path in the generic code, and thus the distinction among interrupts gets lost. This patch preserves the previous behaviour of the rtc-test driver, where e.g. an update interrupt would not trigger an alarm or periodic interrupt, and vice-versa. In real world RTC drivers, this is not an issue, but in the rtc-test driver it may be interesting to distinguish these interrupts for testing purposes. CC: Thomas Gleixner <tglx@linutronix.de> CC: Alessandro Zummo <a.zummo@towertech.it> CC: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br> CC: rtc-linux@googlegroups.com Signed-off-by: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br> Signed-off-by: John Stultz <john.stultz@linaro.org> --- drivers/rtc/rtc-test.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/rtc/rtc-test.c b/drivers/rtc/rtc-test.c index 61ad5ab..34d5631 100644 --- a/drivers/rtc/rtc-test.c +++ b/drivers/rtc/rtc-test.c @@ -71,11 +71,16 @@ static ssize_t test_irq_store(struct device *dev, struct rtc_device *rtc = platform_get_drvdata(plat_dev); retval = count; - if (strncmp(buf, "tick", 4) == 0) + if (strncmp(buf, "tick", 4) == 0 && rtc->pie_enabled) rtc_update_irq(rtc, 1, RTC_PF | RTC_IRQF); - else if (strncmp(buf, "alarm", 5) == 0) - rtc_update_irq(rtc, 1, RTC_AF | RTC_IRQF); - else if (strncmp(buf, "update", 6) == 0) + else if (strncmp(buf, "alarm", 5) == 0) { + struct rtc_wkalrm alrm; + int err = rtc_read_alarm(rtc, &alrm); + + if (!err && alrm.enabled) + rtc_update_irq(rtc, 1, RTC_AF | RTC_IRQF); + + } else if (strncmp(buf, "update", 6) == 0 && rtc->uie_rtctimer.enabled) rtc_update_irq(rtc, 1, RTC_UF | RTC_IRQF); else retval = -EINVAL; -- 1.7.3.2.146.gca209 ^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH 09/10] RTC: sa1100: Update the sa1100 RTC driver. 2011-02-21 23:55 [PATCH 00/10] [RFC] RTC: Cleanups for 2.6.39 John Stultz ` (7 preceding siblings ...) 2011-02-21 23:55 ` [PATCH 08/10] RTC: Fix the cross interrupt issue on rtc-test John Stultz @ 2011-02-21 23:55 ` John Stultz 2011-02-21 23:55 ` [PATCH 10/10] RTC: Fix up rtc.txt documentation to reflect changes to generic rtc layer John Stultz 9 siblings, 0 replies; 32+ messages in thread From: John Stultz @ 2011-02-21 23:55 UTC (permalink / raw) To: LKML Cc: Marcelo Roberto Jimenez, Thomas Gleixner, Alessandro Zummo, rtc-linux, John Stultz From: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br> Since PIE interrupts are now emulated, this patch removes the previous code that used the hardware counters. The removal of read_callback() also fixes a wrong user space behaviour of this driver, which was not returning the right value to read(). [john.stultz: Merge fixups] CC: Thomas Gleixner <tglx@linutronix.de> CC: Alessandro Zummo <a.zummo@towertech.it> CC: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br> CC: rtc-linux@googlegroups.com Signed-off-by: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br> Signed-off-by: John Stultz <john.stultz@linaro.org> --- drivers/rtc/rtc-sa1100.c | 111 +-------------------------------------------- 1 files changed, 3 insertions(+), 108 deletions(-) diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c index 9ece7be..febde00 100644 --- a/drivers/rtc/rtc-sa1100.c +++ b/drivers/rtc/rtc-sa1100.c @@ -43,7 +43,6 @@ #define RTC_DEF_TRIM 0 static const unsigned long RTC_FREQ = 1024; -static unsigned long timer_freq; static struct rtc_time rtc_alarm; static DEFINE_SPINLOCK(sa1100_rtc_lock); @@ -156,97 +155,11 @@ static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } -static int sa1100_irq_set_freq(struct device *dev, int freq) -{ - if (freq < 1 || freq > timer_freq) { - return -EINVAL; - } else { - struct rtc_device *rtc = (struct rtc_device *)dev; - - rtc->irq_freq = freq; - - return 0; - } -} - -static int rtc_timer1_count; - -static inline int sa1100_timer1_retrigger(struct rtc_device *rtc) -{ - unsigned long diff; - unsigned long period = timer_freq / rtc->irq_freq; - - spin_lock_irq(&sa1100_rtc_lock); - - do { - OSMR1 += period; - diff = OSMR1 - OSCR; - /* If OSCR > OSMR1, diff is a very large number (unsigned - * math). This means we have a lost interrupt. */ - } while (diff > period); - OIER |= OIER_E1; - - spin_unlock_irq(&sa1100_rtc_lock); - - return 0; -} - -static irqreturn_t timer1_interrupt(int irq, void *dev_id) -{ - struct platform_device *pdev = to_platform_device(dev_id); - struct rtc_device *rtc = platform_get_drvdata(pdev); - - /* - * If we match for the first time, rtc_timer1_count will be 1. - * Otherwise, we wrapped around (very unlikely but - * still possible) so compute the amount of missed periods. - * The match reg is updated only when the data is actually retrieved - * to avoid unnecessary interrupts. - */ - OSSR = OSSR_M1; /* clear match on timer1 */ - - rtc_update_irq(rtc, rtc_timer1_count, RTC_PF | RTC_IRQF); - - if (rtc_timer1_count == 1) - rtc_timer1_count = - (rtc->irq_freq * ((1 << 30) / (timer_freq >> 2))); - - /* retrigger. */ - sa1100_timer1_retrigger(rtc); - - return IRQ_HANDLED; -} - -static int sa1100_rtc_read_callback(struct device *dev, int data) -{ - if (data & RTC_PF) { - struct rtc_device *rtc = (struct rtc_device *)dev; - - /* interpolate missed periods and set match for the next */ - unsigned long period = timer_freq / rtc->irq_freq; - unsigned long oscr = OSCR; - unsigned long osmr1 = OSMR1; - unsigned long missed = (oscr - osmr1)/period; - data += missed << 8; - OSSR = OSSR_M1; /* clear match on timer 1 */ - OSMR1 = osmr1 + (missed + 1)*period; - /* Ensure we didn't miss another match in the mean time. - * Here we compare (match - OSCR) 8 instead of 0 -- - * see comment in pxa_timer_interrupt() for explanation. - */ - while ((signed long)((osmr1 = OSMR1) - OSCR) <= 8) { - data += 0x100; - OSSR = OSSR_M1; /* clear match on timer 1 */ - OSMR1 = osmr1 + period; - } - } - return data; -} - static int sa1100_rtc_open(struct device *dev) { int ret; - struct rtc_device *rtc = (struct rtc_device *)dev; + struct platform_device *plat_dev = to_platform_device(dev); + struct rtc_device *rtc = platform_get_drvdata(plat_dev); ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, IRQF_DISABLED, "rtc 1Hz", dev); @@ -260,19 +173,11 @@ static int sa1100_rtc_open(struct device *dev) dev_err(dev, "IRQ %d already in use.\n", IRQ_RTCAlrm); goto fail_ai; } - ret = request_irq(IRQ_OST1, timer1_interrupt, IRQF_DISABLED, - "rtc timer", dev); - if (ret) { - dev_err(dev, "IRQ %d already in use.\n", IRQ_OST1); - goto fail_pi; - } rtc->max_user_freq = RTC_FREQ; - sa1100_irq_set_freq(dev, RTC_FREQ); + rtc_irq_set_freq(rtc, NULL, RTC_FREQ); return 0; - fail_pi: - free_irq(IRQ_RTCAlrm, dev); fail_ai: free_irq(IRQ_RTC1Hz, dev); fail_ui: @@ -287,12 +192,10 @@ static void sa1100_rtc_release(struct device *dev) OSSR = OSSR_M1; spin_unlock_irq(&sa1100_rtc_lock); - free_irq(IRQ_OST1, dev); free_irq(IRQ_RTCAlrm, dev); free_irq(IRQ_RTC1Hz, dev); } - static int sa1100_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) { spin_lock_irq(&sa1100_rtc_lock); @@ -348,7 +251,6 @@ static int sa1100_rtc_proc(struct device *dev, struct seq_file *seq) static const struct rtc_class_ops sa1100_rtc_ops = { .open = sa1100_rtc_open, - .read_callback = sa1100_rtc_read_callback, .release = sa1100_rtc_release, .read_time = sa1100_rtc_read_time, .set_time = sa1100_rtc_set_time, @@ -361,8 +263,6 @@ static int sa1100_rtc_probe(struct platform_device *pdev) { struct rtc_device *rtc; - timer_freq = get_clock_tick_rate(); - /* * According to the manual we should be able to let RTTR be zero * and then a default diviser for a 32.768KHz clock is used. @@ -388,11 +288,6 @@ static int sa1100_rtc_probe(struct platform_device *pdev) platform_set_drvdata(pdev, rtc); - /* Set the irq_freq */ - /*TODO: Find out who is messing with this value after we initialize - * it here.*/ - rtc->irq_freq = RTC_FREQ; - /* Fix for a nasty initialization problem the in SA11xx RTSR register. * See also the comments in sa1100_rtc_interrupt(). * -- 1.7.3.2.146.gca209 ^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH 10/10] RTC: Fix up rtc.txt documentation to reflect changes to generic rtc layer 2011-02-21 23:55 [PATCH 00/10] [RFC] RTC: Cleanups for 2.6.39 John Stultz ` (8 preceding siblings ...) 2011-02-21 23:55 ` [PATCH 09/10] RTC: sa1100: Update the sa1100 RTC driver John Stultz @ 2011-02-21 23:55 ` John Stultz 9 siblings, 0 replies; 32+ messages in thread From: John Stultz @ 2011-02-21 23:55 UTC (permalink / raw) To: LKML Cc: John Stultz, Thomas Gleixner, Alessandro Zummo, Marcelo Roberto Jimenez, rtc-linux Now that the genric RTC layer handles much of the RTC functionality, the rtc.txt documentation needs to be updated to remove outdated information. CC: Thomas Gleixner <tglx@linutronix.de> CC: Alessandro Zummo <a.zummo@towertech.it> CC: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br> CC: rtc-linux@googlegroups.com Signed-off-by: John Stultz <john.stultz@linaro.org> --- Documentation/rtc.txt | 29 ++++++++++------------------- 1 files changed, 10 insertions(+), 19 deletions(-) diff --git a/Documentation/rtc.txt b/Documentation/rtc.txt index 9104c10..2501604 100644 --- a/Documentation/rtc.txt +++ b/Documentation/rtc.txt @@ -178,38 +178,29 @@ RTC class framework, but can't be supported by the older driver. setting the longer alarm time and enabling its IRQ using a single request (using the same model as EFI firmware). - * RTC_UIE_ON, RTC_UIE_OFF ... if the RTC offers IRQs, it probably - also offers update IRQs whenever the "seconds" counter changes. - If needed, the RTC framework can emulate this mechanism. + * RTC_UIE_ON, RTC_UIE_OFF ... if the RTC offers IRQs, the RTC framework + will emulate this mechanism. - * RTC_PIE_ON, RTC_PIE_OFF, RTC_IRQP_SET, RTC_IRQP_READ ... another - feature often accessible with an IRQ line is a periodic IRQ, issued - at settable frequencies (usually 2^N Hz). + * RTC_PIE_ON, RTC_PIE_OFF, RTC_IRQP_SET, RTC_IRQP_READ ... these icotls + are emulated via a kernel hrtimer. In many cases, the RTC alarm can be a system wake event, used to force Linux out of a low power sleep state (or hibernation) back to a fully operational state. For example, a system could enter a deep power saving state until it's time to execute some scheduled tasks. -Note that many of these ioctls need not actually be implemented by your -driver. The common rtc-dev interface handles many of these nicely if your -driver returns ENOIOCTLCMD. Some common examples: +Note that many of these ioctls are handled by the common rtc-dev interface. +Some common examples: * RTC_RD_TIME, RTC_SET_TIME: the read_time/set_time functions will be called with appropriate values. - * RTC_ALM_SET, RTC_ALM_READ, RTC_WKALM_SET, RTC_WKALM_RD: the - set_alarm/read_alarm functions will be called. + * RTC_ALM_SET, RTC_ALM_READ, RTC_WKALM_SET, RTC_WKALM_RD: gets or sets + the alarm rtc_timer. May call the set_alarm driver function. - * RTC_IRQP_SET, RTC_IRQP_READ: the irq_set_freq function will be called - to set the frequency while the framework will handle the read for you - since the frequency is stored in the irq_freq member of the rtc_device - structure. Your driver needs to initialize the irq_freq member during - init. Make sure you check the requested frequency is in range of your - hardware in the irq_set_freq function. If it isn't, return -EINVAL. If - you cannot actually change the frequency, do not define irq_set_freq. + * RTC_IRQP_SET, RTC_IRQP_READ: These are emulated by the generic code. - * RTC_PIE_ON, RTC_PIE_OFF: the irq_set_state function will be called. + * RTC_PIE_ON, RTC_PIE_OFF: These are also emulated by the generic code. If all else fails, check out the rtc-test.c driver! -- 1.7.3.2.146.gca209 ^ permalink raw reply related [flat|nested] 32+ messages in thread
end of thread, other threads:[~2011-02-22 23:07 UTC | newest] Thread overview: 32+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-02-21 23:55 [PATCH 00/10] [RFC] RTC: Cleanups for 2.6.39 John Stultz 2011-02-21 23:55 ` [PATCH 01/10] RTC: Cleanup rtc_class_ops->irq_set_state John Stultz 2011-02-21 23:55 ` [PATCH 02/10] RTC: Cleanup rtc_class_ops->irq_set_freq() John Stultz 2011-02-21 23:55 ` [PATCH 03/10] RTC: Cleanup rtc_class_ops->update_irq_enable() John Stultz 2011-02-21 23:55 ` [PATCH 04/10] RTC: Cleanup rtc_class_ops->read_alarm() John Stultz 2011-02-22 2:34 ` [rtc-linux] " Mark Brown 2011-02-22 2:55 ` John Stultz 2011-02-22 8:09 ` john stultz 2011-02-22 12:51 ` Marcelo Roberto Jimenez 2011-02-22 19:35 ` john stultz 2011-02-22 19:51 ` Mark Brown 2011-02-22 19:58 ` john stultz 2011-02-22 21:26 ` Marcelo Roberto Jimenez 2011-02-22 18:16 ` Mark Brown 2011-02-22 19:51 ` john stultz 2011-02-22 20:00 ` Mark Brown 2011-02-22 20:22 ` john stultz 2011-02-22 21:05 ` Mark Brown 2011-02-22 21:21 ` john stultz 2011-02-22 21:27 ` Thomas Gleixner 2011-02-22 21:40 ` Mark Brown 2011-02-22 21:33 ` Mark Brown 2011-02-22 22:10 ` john stultz 2011-02-22 23:07 ` Mark Brown 2011-02-22 19:53 ` john stultz 2011-02-22 20:31 ` Mark Brown 2011-02-21 23:55 ` [PATCH 05/10] RTC: Clean out UIE icotl implementations John Stultz 2011-02-21 23:55 ` [PATCH 06/10] RTC: Include information about UIE and PIE in RTC driver proc John Stultz 2011-02-21 23:55 ` [PATCH 07/10] RTC: Remove UIE and PIE information from the sa1100 " John Stultz 2011-02-21 23:55 ` [PATCH 08/10] RTC: Fix the cross interrupt issue on rtc-test John Stultz 2011-02-21 23:55 ` [PATCH 09/10] RTC: sa1100: Update the sa1100 RTC driver John Stultz 2011-02-21 23:55 ` [PATCH 10/10] RTC: Fix up rtc.txt documentation to reflect changes to generic rtc layer John Stultz
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox