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@xxxxxxx> --- 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