diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-06 06:26:36 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-06 06:26:36 -1000 |
| commit | be76865df56f22f29ab20e671143761d78ed09c8 (patch) | |
| tree | e80ba58a3f927e6fb00bbab47c0aaee74a31e2d1 /drivers/rtc/rtc-da9063.c | |
| parent | f654f0fc0bd3f1b0ec76e654bf1cc21f33382241 (diff) | |
| parent | 882c5e552ffd06856de42261460f46e18319d259 (diff) | |
| download | talos-op-linux-be76865df56f22f29ab20e671143761d78ed09c8.tar.gz talos-op-linux-be76865df56f22f29ab20e671143761d78ed09c8.zip | |
Merge tag 'rtc-5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
Pull RTC fixes from Alexandre Belloni:
- Various alarm fixes for da9063, cros-ec and sh
- sd3078 manufacturer name fix as this was introduced this cycle
* tag 'rtc-5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
rtc: da9063: set uie_unsupported when relevant
rtc: sd3078: fix manufacturer name
rtc: sh: Fix invalid alarm warning for non-enabled alarm
rtc: cros-ec: Fail suspend/resume if wake IRQ can't be configured
Diffstat (limited to 'drivers/rtc/rtc-da9063.c')
| -rw-r--r-- | drivers/rtc/rtc-da9063.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-da9063.c b/drivers/rtc/rtc-da9063.c index b4e054c64bad..69b54e5556c0 100644 --- a/drivers/rtc/rtc-da9063.c +++ b/drivers/rtc/rtc-da9063.c @@ -480,6 +480,13 @@ static int da9063_rtc_probe(struct platform_device *pdev) da9063_data_to_tm(data, &rtc->alarm_time, rtc); rtc->rtc_sync = false; + /* + * TODO: some models have alarms on a minute boundary but still support + * real hardware interrupts. Add this once the core supports it. + */ + if (config->rtc_data_start != RTC_SEC) + rtc->rtc_dev->uie_unsupported = 1; + irq_alarm = platform_get_irq_byname(pdev, "ALARM"); ret = devm_request_threaded_irq(&pdev->dev, irq_alarm, NULL, da9063_alarm_event, |
