Skip to contentSkip to conversation

rtc: fsl-ftm-alarm: fix freeze(s2idle) failed to wake

PATCH Applied Ran Wang 2 participants 2 messages Jun 1, 2020 – Jun 5, 2020 Real time clock (RTC)

lore
Share & tools
lore

Ran Wang

author
#0 lore raw

PATCH v2 1/1 rtc: fsl-ftm-alarm: fix freeze(s2idle) failed to wake

Use dev_pm_set_wake_irq() instead of flag IRQF_NO_SUSPEND to enable wakeup system feature for both freeze(s2idle) and mem(deep).

---
Change in v2:
- Remove wakeup-source control since the irq should be able to wakeup. And this is not the case that RTC interrupt line is not connected directly to SoC.

 drivers/rtc/rtc-fsl-ftm-alarm.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/rtc/rtc-fsl-ftm-alarm.c +5 -1
index 756af62..6775205 100644
@@ -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)
 
@@ -274,7 +275,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;
@@ -287,6 +288,9 @@ static int ftm_rtc_probe(struct platform_device *pdev)
 	rtc->rtc_dev->ops = &ftm_rtc_ops;
 
 	device_init_wakeup(&pdev->dev, true);
+	ret = dev_pm_set_wake_irq(&pdev->dev, irq);
+	if (ret)
+		dev_err(&pdev->dev, "failed to enable irq wake\n");
 
 	ret = rtc_register_device(rtc->rtc_dev);
 	if (ret) {
Signature · 1 line
2.7.4
maintainer Applied
#1 lore raw
Quoted 2 lines · Ran Wang

Use dev_pm_set_wake_irq() instead of flag IRQF_NO_SUSPEND to enable wakeup system feature for both freeze(s2idle) and mem(deep).

Applied, thanks!

[1/1] rtc: fsl-ftm-alarm: fix freeze(s2idle) failed to wake

      commit: 3a8ce46ce15accad53b39837735c12d886964211

Best regards,

Signature · 1 line
Alexandre Belloni <[email protected]>