Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+12
-5
+2
-2
drivers/rtc/Kconfig
+2
-2
drivers/rtc/Kconfig
···
667
667
will be called rtc-s5m.
668
668
669
669
config RTC_DRV_SD3078
670
-
tristate "ZXW Crystal SD3078"
670
+
tristate "ZXW Shenzhen whwave SD3078"
671
671
help
672
-
If you say yes here you get support for the ZXW Crystal
672
+
If you say yes here you get support for the ZXW Shenzhen whwave
673
673
SD3078 RTC chips.
674
674
675
675
This driver can also be built as a module. If so, the module
+2
-2
drivers/rtc/rtc-cros-ec.c
+2
-2
drivers/rtc/rtc-cros-ec.c
···
298
298
struct cros_ec_rtc *cros_ec_rtc = dev_get_drvdata(&pdev->dev);
299
299
300
300
if (device_may_wakeup(dev))
301
-
enable_irq_wake(cros_ec_rtc->cros_ec->irq);
301
+
return enable_irq_wake(cros_ec_rtc->cros_ec->irq);
302
302
303
303
return 0;
304
304
}
···
309
309
struct cros_ec_rtc *cros_ec_rtc = dev_get_drvdata(&pdev->dev);
310
310
311
311
if (device_may_wakeup(dev))
312
-
disable_irq_wake(cros_ec_rtc->cros_ec->irq);
312
+
return disable_irq_wake(cros_ec_rtc->cros_ec->irq);
313
313
314
314
return 0;
315
315
}
+7
drivers/rtc/rtc-da9063.c
+7
drivers/rtc/rtc-da9063.c
···
480
480
da9063_data_to_tm(data, &rtc->alarm_time, rtc);
481
481
rtc->rtc_sync = false;
482
482
483
+
/*
484
+
* TODO: some models have alarms on a minute boundary but still support
485
+
* real hardware interrupts. Add this once the core supports it.
486
+
*/
487
+
if (config->rtc_data_start != RTC_SEC)
488
+
rtc->rtc_dev->uie_unsupported = 1;
489
+
483
490
irq_alarm = platform_get_irq_byname(pdev, "ALARM");
484
491
ret = devm_request_threaded_irq(&pdev->dev, irq_alarm, NULL,
485
492
da9063_alarm_event,
+1
-1
drivers/rtc/rtc-sh.c
+1
-1
drivers/rtc/rtc-sh.c
···
374
374
static inline int sh_rtc_read_alarm_value(struct sh_rtc *rtc, int reg_off)
375
375
{
376
376
unsigned int byte;
377
-
int value = 0xff; /* return 0xff for ignored values */
377
+
int value = -1; /* return -1 for ignored values */
378
378
379
379
byte = readb(rtc->regbase + reg_off);
380
380
if (byte & AR_ENB) {