summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDavid Lowe <dave-lowe@ntlworld.com>2017-04-22 19:28:00 +0200
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>2017-05-31 09:17:00 +0200
commit8066360744743fb7f2dee1e2041fc9fc92f9d6b5 (patch)
treee2114d996b89ac842483095c77149b0c7999d637 /drivers
parentrtc: ds1307: convert driver to regmap (diff)
downloadlinux-8066360744743fb7f2dee1e2041fc9fc92f9d6b5.tar.xz
linux-8066360744743fb7f2dee1e2041fc9fc92f9d6b5.zip
rtc: rtc-ds1307: enable support for mcp794xx as a wakeup source without IRQ
This patch extends the fixes for ds1337, ds1339, ds3231 in commit 8bc2a40730ec ("rtc: ds1307: add support for the DT property 'wakeup-source'") to mcp794xx devices, so that those parts can similarly be used as a wakeup source without an IRQ to the processor. Tested on Raspberry Pi ZeroW with MCP79400. Signed-off-by: David Lowe <dave-lowe@ntlworld.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/rtc/rtc-ds1307.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index 94e13d703735..a264938500af 100644
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -1407,7 +1407,8 @@ static int ds1307_probe(struct i2c_client *client,
break;
case mcp794xx:
rtc_ops = &mcp794xx_rtc_ops;
- if (ds1307->irq > 0 && chip->alarm) {
+ if (chip->alarm && (ds1307->irq > 0 ||
+ ds1307_can_wakeup_device)) {
irq_handler = mcp794xx_irq;
want_irq = true;
}