Commit 38a7a73e authored Apr 19, 2016 by Nishanth Menon Committed by Alexandre Belloni Apr 21, 2016

rtc: ds1307: Use irq when available for wakeup-source device



With commit 8bc2a407 ("rtc: ds1307: add support for the
DT property 'wakeup-source'") we lost the ability for rtc irq
functionality for devices that are actually hooked on a real IRQ
line and have capability to wakeup as well. This is not an expected
behavior. So, instead of just not requesting IRQ, skip the IRQ
requirement only if interrupts are not defined for the device.

Fixes: 8bc2a407 ("rtc: ds1307: add support for the DT property 'wakeup-source'")
Reported-by: Tony Lindgren <tony@atomide.com>
Cc: Michael Lange <linuxstuff@milaw.biz>
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

parent 9a3dce62

drivers/rtc/rtc-ds1307.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1531,7 +1531,7 @@ read_rtc:
		return PTR_ERR(ds1307->rtc);
		}

		if (ds1307_can_wakeup_device) {
		if (ds1307_can_wakeup_device && ds1307->client->irq <= 0) {
		/* Disable request for an IRQ */
		want_irq = false;
		dev_info(&client->dev, "'wakeup-source' is set, request for an IRQ is disabled!\n");

Admin message