From: Ran Wang <ran.wang_1@nxp.com>
To: Alessandro Zummo <a.zummo@towertech.it>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
Rob Herring <robh+dt@kernel.org>, Li Biwen <biwen.li@nxp.com>
Cc: linux-rtc@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, Ran Wang <ran.wang_1@nxp.com>
Subject: [PATCH 2/2] rtc: fsl-ftm-alarm: fix freeze(s2idle) doesnot wake
Date: Fri, 29 May 2020 14:10:35 +0800 [thread overview]
Message-ID: <20200529061035.18912-2-ran.wang_1@nxp.com> (raw)
In-Reply-To: <20200529061035.18912-1-ran.wang_1@nxp.com>
Use dev_pm_set_wake_irq() instead of flag IRQF_NO_SUSPEND to enable
wakeup system feature for both freeze(s2idle) and mem(deep).
Use property 'wakeup-source' to control this feature.
Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
---
drivers/rtc/rtc-fsl-ftm-alarm.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/rtc/rtc-fsl-ftm-alarm.c b/drivers/rtc/rtc-fsl-ftm-alarm.c
index 756af62..c6945d84 100644
--- a/drivers/rtc/rtc-fsl-ftm-alarm.c
+++ b/drivers/rtc/rtc-fsl-ftm-alarm.c
@@ -21,6 +21,7 @@
#include <linux/rtc.h>
#include <linux/time.h>
#include <linux/acpi.h>
+#include <linux/pm_wakeirq.h>
#define FTM_SC_CLK(c) ((c) << FTM_SC_CLK_MASK_SHIFT)
@@ -41,6 +42,7 @@ struct ftm_rtc {
struct rtc_device *rtc_dev;
void __iomem *base;
bool big_endian;
+ bool wakeup;
u32 alarm_freq;
};
@@ -267,6 +269,9 @@ static int ftm_rtc_probe(struct platform_device *pdev)
return PTR_ERR(rtc->base);
}
+ rtc->wakeup =
+ device_property_read_bool(&pdev->dev, "wakeup-source");
+
irq = platform_get_irq(pdev, 0);
if (irq < 0) {
dev_err(&pdev->dev, "can't get irq number\n");
@@ -274,7 +279,7 @@ static int ftm_rtc_probe(struct platform_device *pdev)
}
ret = devm_request_irq(&pdev->dev, irq, ftm_rtc_alarm_interrupt,
- IRQF_NO_SUSPEND, dev_name(&pdev->dev), rtc);
+ 0, dev_name(&pdev->dev), rtc);
if (ret < 0) {
dev_err(&pdev->dev, "failed to request irq\n");
return ret;
@@ -286,7 +291,10 @@ static int ftm_rtc_probe(struct platform_device *pdev)
rtc->alarm_freq = (u32)FIXED_FREQ_CLK / (u32)MAX_FREQ_DIV;
rtc->rtc_dev->ops = &ftm_rtc_ops;
- device_init_wakeup(&pdev->dev, true);
+ device_init_wakeup(&pdev->dev, rtc->wakeup);
+ ret = dev_pm_set_wake_irq(&pdev->dev, irq);
+ if (ret)
+ dev_err(&pdev->dev, "irq wake enable failed.\n");
ret = rtc_register_device(rtc->rtc_dev);
if (ret) {
--
2.7.4
next prev parent reply other threads:[~2020-05-29 6:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-29 6:10 [PATCH 1/2] dt-bindings: rtc: add wakeup-source for FlexTimer Ran Wang
2020-05-29 6:10 ` Ran Wang [this message]
2020-05-29 8:23 ` [PATCH 2/2] rtc: fsl-ftm-alarm: fix freeze(s2idle) doesnot wake Alexandre Belloni
2020-05-29 8:18 ` [PATCH 1/2] dt-bindings: rtc: add wakeup-source for FlexTimer Alexandre Belloni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200529061035.18912-2-ran.wang_1@nxp.com \
--to=ran.wang_1@nxp.com \
--cc=a.zummo@towertech.it \
--cc=alexandre.belloni@bootlin.com \
--cc=biwen.li@nxp.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rtc@vger.kernel.org \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.