Message ID | 1372412109-986-3-git-send-email-gururaja.hebbar@ti.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Hi, On Fri, Jun 28, 2013 at 15:05:07, Hebbar, Gururaja wrote: > Since now rtc-omap driver itself calls deice_init_wakeup(dev, true), > duplicate call from the rtc device registration can be removed. > Tested on da850-evm for rtc wake along with patch 1/2. $rtcwake -s 2 -d /dev/rtc0 -m mem Tested-by: Manjunathappa, Prakash <prakash.pm@ti.com> > This is basically a partial revert of the prev commit > > commit 75c99bb0006ee065b4e2995078d779418b0fab54 > Author: Sekhar Nori <nsekhar@ti.com> > > davinci: da8xx/omap-l1: mark RTC as a wakeup source > > Signed-off-by: Hebbar Gururaja <gururaja.hebbar@ti.com> > Cc: Sekhar Nori <nsekhar@ti.com> > Cc: Kevin Hilman <khilman@linaro.org> > Cc: Russell King <linux@arm.linux.org.uk> > > --- > :100644 100644 bf57252... 85a900c... M arch/arm/mach-davinci/devices-da8xx.c > arch/arm/mach-davinci/devices-da8xx.c | 9 +-------- > 1 file changed, 1 insertion(+), 8 deletions(-) > > diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c > index bf57252..85a900c 100644 > --- a/arch/arm/mach-davinci/devices-da8xx.c > +++ b/arch/arm/mach-davinci/devices-da8xx.c > @@ -827,14 +827,7 @@ static struct platform_device da8xx_rtc_device = { > > int da8xx_register_rtc(void) > { > - int ret; > - > - ret = platform_device_register(&da8xx_rtc_device); > - if (!ret) > - /* Atleast on DA850, RTC is a wakeup source */ > - device_init_wakeup(&da8xx_rtc_device.dev, true); > - > - return ret; > + return platform_device_register(&da8xx_rtc_device); > } > > static void __iomem *da8xx_ddr2_ctlr_base; > -- > 1.7.9.5 > > _______________________________________________ > Davinci-linux-open-source mailing list > Davinci-linux-open-source@linux.davincidsp.com > http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hebbar Gururaja <gururaja.hebbar@ti.com> writes: > Since now rtc-omap driver itself calls deice_init_wakeup(dev, true), > duplicate call from the rtc device registration can be removed. > > This is basically a partial revert of the prev commit > > commit 75c99bb0006ee065b4e2995078d779418b0fab54 > Author: Sekhar Nori <nsekhar@ti.com> > > davinci: da8xx/omap-l1: mark RTC as a wakeup source > > Signed-off-by: Hebbar Gururaja <gururaja.hebbar@ti.com> > Cc: Sekhar Nori <nsekhar@ti.com> > Cc: Kevin Hilman <khilman@linaro.org> > Cc: Russell King <linux@arm.linux.org.uk> > > --- > :100644 100644 bf57252... 85a900c... M arch/arm/mach-davinci/devices-da8xx.c > arch/arm/mach-davinci/devices-da8xx.c | 9 +-------- > 1 file changed, 1 insertion(+), 8 deletions(-) > > diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c > index bf57252..85a900c 100644 > --- a/arch/arm/mach-davinci/devices-da8xx.c > +++ b/arch/arm/mach-davinci/devices-da8xx.c > @@ -827,14 +827,7 @@ static struct platform_device da8xx_rtc_device = { > > int da8xx_register_rtc(void) > { > - int ret; > - > - ret = platform_device_register(&da8xx_rtc_device); > - if (!ret) > - /* Atleast on DA850, RTC is a wakeup source */ > - device_init_wakeup(&da8xx_rtc_device.dev, true); > - > - return ret; > + return platform_device_register(&da8xx_rtc_device); nit: extra space between 'return' and 'platform_' > } > > static void __iomem *da8xx_ddr2_ctlr_base; Otherwise, Acked-by: Kevin Hilman <khilman@linaro.org> -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Jul 02, 2013 at 05:37:43, Kevin Hilman wrote: > Hebbar Gururaja <gururaja.hebbar@ti.com> writes: > > > Since now rtc-omap driver itself calls deice_init_wakeup(dev, true), > > duplicate call from the rtc device registration can be removed. > > > > This is basically a partial revert of the prev commit > > > > commit 75c99bb0006ee065b4e2995078d779418b0fab54 > > Author: Sekhar Nori <nsekhar@ti.com> > > > > davinci: da8xx/omap-l1: mark RTC as a wakeup source > > > > Signed-off-by: Hebbar Gururaja <gururaja.hebbar@ti.com> > > Cc: Sekhar Nori <nsekhar@ti.com> > > Cc: Kevin Hilman <khilman@linaro.org> > > Cc: Russell King <linux@arm.linux.org.uk> > > > > --- > > :100644 100644 bf57252... 85a900c... M arch/arm/mach-davinci/devices-da8xx.c > > arch/arm/mach-davinci/devices-da8xx.c | 9 +-------- > > 1 file changed, 1 insertion(+), 8 deletions(-) > > > > diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c > > index bf57252..85a900c 100644 > > --- a/arch/arm/mach-davinci/devices-da8xx.c > > +++ b/arch/arm/mach-davinci/devices-da8xx.c > > @@ -827,14 +827,7 @@ static struct platform_device da8xx_rtc_device = { > > > > int da8xx_register_rtc(void) > > { > > - int ret; > > - > > - ret = platform_device_register(&da8xx_rtc_device); > > - if (!ret) > > - /* Atleast on DA850, RTC is a wakeup source */ > > - device_init_wakeup(&da8xx_rtc_device.dev, true); > > - > > - return ret; > > + return platform_device_register(&da8xx_rtc_device); > > nit: extra space between 'return' and 'platform_' Thanks for the review. V2 will soon follow. > > > } > > > > static void __iomem *da8xx_ddr2_ctlr_base; > > Otherwise, > > Acked-by: Kevin Hilman <khilman@linaro.org> > > Regards, Gururaja -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 6/28/2013 3:05 PM, Hebbar Gururaja wrote: > Since now rtc-omap driver itself calls deice_init_wakeup(dev, true), > duplicate call from the rtc device registration can be removed. > > This is basically a partial revert of the prev commit > > commit 75c99bb0006ee065b4e2995078d779418b0fab54 > Author: Sekhar Nori <nsekhar@ti.com> > > davinci: da8xx/omap-l1: mark RTC as a wakeup source > > Signed-off-by: Hebbar Gururaja <gururaja.hebbar@ti.com> > Cc: Sekhar Nori <nsekhar@ti.com> > Cc: Kevin Hilman <khilman@linaro.org> > Cc: Russell King <linux@arm.linux.org.uk> Subject line should be prefixed with ARM: keeping with arch/arm convention. Otherwise looks good. Acked-by: Sekhar Nori <nsekhar@ti.com> Thanks, Sekhar -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Jul 02, 2013 at 11:10:14, Nori, Sekhar wrote: > > On 6/28/2013 3:05 PM, Hebbar Gururaja wrote: > > Since now rtc-omap driver itself calls deice_init_wakeup(dev, true), > > duplicate call from the rtc device registration can be removed. > > > > This is basically a partial revert of the prev commit > > > > commit 75c99bb0006ee065b4e2995078d779418b0fab54 > > Author: Sekhar Nori <nsekhar@ti.com> > > > > davinci: da8xx/omap-l1: mark RTC as a wakeup source > > > > Signed-off-by: Hebbar Gururaja <gururaja.hebbar@ti.com> > > Cc: Sekhar Nori <nsekhar@ti.com> > > Cc: Kevin Hilman <khilman@linaro.org> > > Cc: Russell King <linux@arm.linux.org.uk> > > Subject line should be prefixed with ARM: keeping with arch/arm > convention. Otherwise looks good. Will fix it in v2. > > Acked-by: Sekhar Nori <nsekhar@ti.com> Thanks for the review. > > Thanks, > Sekhar > Regards, Gururaja
diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c index bf57252..85a900c 100644 --- a/arch/arm/mach-davinci/devices-da8xx.c +++ b/arch/arm/mach-davinci/devices-da8xx.c @@ -827,14 +827,7 @@ static struct platform_device da8xx_rtc_device = { int da8xx_register_rtc(void) { - int ret; - - ret = platform_device_register(&da8xx_rtc_device); - if (!ret) - /* Atleast on DA850, RTC is a wakeup source */ - device_init_wakeup(&da8xx_rtc_device.dev, true); - - return ret; + return platform_device_register(&da8xx_rtc_device); } static void __iomem *da8xx_ddr2_ctlr_base;
Since now rtc-omap driver itself calls deice_init_wakeup(dev, true), duplicate call from the rtc device registration can be removed. This is basically a partial revert of the prev commit commit 75c99bb0006ee065b4e2995078d779418b0fab54 Author: Sekhar Nori <nsekhar@ti.com> davinci: da8xx/omap-l1: mark RTC as a wakeup source Signed-off-by: Hebbar Gururaja <gururaja.hebbar@ti.com> Cc: Sekhar Nori <nsekhar@ti.com> Cc: Kevin Hilman <khilman@linaro.org> Cc: Russell King <linux@arm.linux.org.uk> --- :100644 100644 bf57252... 85a900c... M arch/arm/mach-davinci/devices-da8xx.c arch/arm/mach-davinci/devices-da8xx.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)