linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] rtc: ds1307: Use irq when available for wakeup-source device
@ 2016-04-19 16:23 Nishanth Menon
  2016-04-19 22:56 ` Alexandre Belloni
  0 siblings, 1 reply; 2+ messages in thread
From: Nishanth Menon @ 2016-04-19 16:23 UTC (permalink / raw)
  To: Alexandre Belloni, Alessandro Zummo
  Cc: Nishanth Menon, rtc-linux, linux-kernel, linux-omap,
	linux-arm-kernel, Michael Lange

With commit 8bc2a40730ec ("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: 8bc2a40730ec ("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>
---

 drivers/rtc/rtc-ds1307.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index b2156ee5bae1..74cd5cd544ee 100644
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -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");
-- 
2.8.0

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] rtc: ds1307: Use irq when available for wakeup-source device
  2016-04-19 16:23 [PATCH] rtc: ds1307: Use irq when available for wakeup-source device Nishanth Menon
@ 2016-04-19 22:56 ` Alexandre Belloni
  0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Belloni @ 2016-04-19 22:56 UTC (permalink / raw)
  To: Nishanth Menon
  Cc: Alessandro Zummo, linux-kernel, rtc-linux, linux-omap,
	linux-arm-kernel, Michael Lange

On 19/04/2016 at 11:23:54 -0500, Nishanth Menon wrote :
> With commit 8bc2a40730ec ("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: 8bc2a40730ec ("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>
> ---
> 
>  drivers/rtc/rtc-ds1307.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
Applied, thanks.

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-04-19 22:56 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-19 16:23 [PATCH] rtc: ds1307: Use irq when available for wakeup-source device Nishanth Menon
2016-04-19 22:56 ` Alexandre Belloni

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).