Commit-ID: c3b79770e51ab1fd4201f3b54edf30113b9ce74f Gitweb: http://git.kernel.org/tip/c3b79770e51ab1fd4201f3b54edf30113b9ce74f Author: John Stultz <john.stultz@xxxxxxxxxx> AuthorDate: Mon, 12 Dec 2011 13:57:52 -0800 Committer: John Stultz <john.stultz@xxxxxxxxxx> CommitDate: Tue, 13 Dec 2011 12:26:24 -0800 rtc: m41t80: Workaround broken alarm functionality The m41t80 driver can read and set the alarm, but it doesn't seem to have a functional alarm irq. This causes failures when the generic core sees alarm functions, but then cannot use them properly for things like UIE mode. Disabling the alarm functions allows proper error reporting, and possible fallback to emulated modes. Once someone fixes the alarm irq functionality, this can be restored. CC: stable@xxxxxxxxxx CC: Matt Turner <mattst88@xxxxxxxxx> CC: Nico Macrionitis <acrux@xxxxxxxxxxx> CC: Atsushi Nemoto <anemo@xxxxxxxxxxxxx> Reported-by: Matt Turner <mattst88@xxxxxxxxx> Reported-by: Nico Macrionitis <acrux@xxxxxxxxxxx> Tested-by: Nico Macrionitis <acrux@xxxxxxxxxxx> Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx> --- drivers/rtc/rtc-m41t80.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/drivers/rtc/rtc-m41t80.c b/drivers/rtc/rtc-m41t80.c index eda128f..64aedd8 100644 --- a/drivers/rtc/rtc-m41t80.c +++ b/drivers/rtc/rtc-m41t80.c @@ -357,10 +357,19 @@ static int m41t80_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *t) static struct rtc_class_ops m41t80_rtc_ops = { .read_time = m41t80_rtc_read_time, .set_time = m41t80_rtc_set_time, + /* + * XXX - m41t80 alarm functionality is reported broken. + * until it is fixed, don't register alarm functions. + * .read_alarm = m41t80_rtc_read_alarm, .set_alarm = m41t80_rtc_set_alarm, + */ .proc = m41t80_rtc_proc, + /* + * See above comment on broken alarm + * .alarm_irq_enable = m41t80_rtc_alarm_irq_enable, + */ }; #if defined(CONFIG_RTC_INTF_SYSFS) || defined(CONFIG_RTC_INTF_SYSFS_MODULE) -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html