2015-07-02 08:37:33

by Wei-Ning Huang

Subject: [PATCH] rtc-mt6397: enable wakeup before registering rtc device

rtc_sysfs_add_device checks if device can wakeup before creating the
wakealarm file in sysfs. Thus the driver must set wakeup capability
before registering the rtc device.

Signed-off-by: Wei-Ning Huang <[email protected]>
---
drivers/rtc/rtc-mt6397.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/rtc/rtc-mt6397.c b/drivers/rtc/rtc-mt6397.c
index c0090b6..eab230b 100644
--- a/drivers/rtc/rtc-mt6397.c
+++ b/drivers/rtc/rtc-mt6397.c
@@ -343,6 +343,8 @@ static int mtk_rtc_probe(struct platform_device *pdev)
goto out_dispose_irq;
}

+ device_init_wakeup(&pdev->dev, 1);
+
rtc->rtc_dev = rtc_device_register("mt6397-rtc", &pdev->dev,
&mtk_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc->rtc_dev)) {
@@ -351,8 +353,6 @@ static int mtk_rtc_probe(struct platform_device *pdev)
goto out_free_irq;
}

- device_init_wakeup(&pdev->dev, 1);
-
return 0;

out_free_irq:
--
2.1.2

2015-07-02 08:49:55

by Eddie Huang (黃智傑)

Subject: Re: [PATCH] rtc-mt6397: enable wakeup before registering rtc device

On Thu, 2015-07-02 at 16:36 +0800, Wei-Ning Huang wrote:
> rtc_sysfs_add_device checks if device can wakeup before creating the
> wakealarm file in sysfs. Thus the driver must set wakeup capability
> before registering the rtc device.
>
> Signed-off-by: Wei-Ning Huang <[email protected]>
> ---
> drivers/rtc/rtc-mt6397.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/rtc/rtc-mt6397.c b/drivers/rtc/rtc-mt6397.c
> index c0090b6..eab230b 100644
> --- a/drivers/rtc/rtc-mt6397.c
> +++ b/drivers/rtc/rtc-mt6397.c
> @@ -343,6 +343,8 @@ static int mtk_rtc_probe(struct platform_device *pdev)
> goto out_dispose_irq;
> }
>
> + device_init_wakeup(&pdev->dev, 1);
> +
> rtc->rtc_dev = rtc_device_register("mt6397-rtc", &pdev->dev,
> &mtk_rtc_ops, THIS_MODULE);
> if (IS_ERR(rtc->rtc_dev)) {
> @@ -351,8 +353,6 @@ static int mtk_rtc_probe(struct platform_device *pdev)
> goto out_free_irq;
> }
>
> - device_init_wakeup(&pdev->dev, 1);
> -
> return 0;
>
> out_free_irq:

Thanks your correction.

Acked-by: Eddie Huang <[email protected]>

2015-07-02 19:09:49

by Alexandre Belloni

Subject: Re: [PATCH] rtc-mt6397: enable wakeup before registering rtc device

On 02/07/2015 at 16:36:56 +0800, Wei-Ning Huang wrote :
> rtc_sysfs_add_device checks if device can wakeup before creating the
> wakealarm file in sysfs. Thus the driver must set wakeup capability
> before registering the rtc device.
>
> Signed-off-by: Wei-Ning Huang <[email protected]>
> ---
> drivers/rtc/rtc-mt6397.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
Applied on rtc-fixes, thanks.

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