Re: [PATCH 02/12] rtc: omap: fix missing wakealarm attribute

2014-10-10 Thread Felipe Balbi 
On Thu, Oct 09, 2014 at 09:06:24PM +0200, Johan Hovold wrote:
 The platform device must be registered as wakeup capable before
 registering the class device, or the wakealarm attribute will not be
 created.
 
 Also make sure to unregister the wakeup source on probe errors.
 
 Fixes: 1d2e2b65d098 (rtc: omap: restore back (hard-code) wakeup support)
 Cc: stable sta...@vger.kernel.org
 Signed-off-by: Johan Hovold jo...@kernel.org
 ---

Reviewed-by: Felipe Balbi ba...@ti.com

  drivers/rtc/rtc-omap.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
 index f842c216f2dd..828cb9983cc2 100644
 --- a/drivers/rtc/rtc-omap.c
 +++ b/drivers/rtc/rtc-omap.c
 @@ -416,6 +416,8 @@ static int __init omap_rtc_probe(struct platform_device 
 *pdev)
   rtc_writel(KICK1_VALUE, OMAP_RTC_KICK1_REG);
   }
  
 + device_init_wakeup(pdev-dev, true);
 +
   rtc = devm_rtc_device_register(pdev-dev, pdev-name,
   omap_rtc_ops, THIS_MODULE);
   if (IS_ERR(rtc)) {
 @@ -484,8 +486,6 @@ static int __init omap_rtc_probe(struct platform_device 
 *pdev)
*is write-only, and always reads as zero...)
*/
  
 - device_init_wakeup(pdev-dev, true);
 -
   if (new_ctrl  (u8) OMAP_RTC_CTRL_SPLIT)
   pr_info(%s: split power mode\n, pdev-name);
  
 @@ -495,6 +495,7 @@ static int __init omap_rtc_probe(struct platform_device 
 *pdev)
   return 0;
  
  fail0:
 + device_init_wakeup(pdev-dev, false);
   if (id_entry-driver_data  OMAP_RTC_HAS_KICKER)
   rtc_writel(0, OMAP_RTC_KICK0_REG);
   pm_runtime_put_sync(pdev-dev);
 -- 
 2.0.4
 

-- 
balbi


signature.asc
Description: Digital signature

[PATCH 02/12] rtc: omap: fix missing wakealarm attribute

2014-10-09 Thread Johan Hovold 
The platform device must be registered as wakeup capable before
registering the class device, or the wakealarm attribute will not be
created.

Also make sure to unregister the wakeup source on probe errors.

Fixes: 1d2e2b65d098 (rtc: omap: restore back (hard-code) wakeup support)
Cc: stable sta...@vger.kernel.org
Signed-off-by: Johan Hovold jo...@kernel.org
---
 drivers/rtc/rtc-omap.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index f842c216f2dd..828cb9983cc2 100644
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@ -416,6 +416,8 @@ static int __init omap_rtc_probe(struct platform_device 
*pdev)
rtc_writel(KICK1_VALUE, OMAP_RTC_KICK1_REG);
}
 
+   device_init_wakeup(pdev-dev, true);
+
rtc = devm_rtc_device_register(pdev-dev, pdev-name,
omap_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc)) {
@@ -484,8 +486,6 @@ static int __init omap_rtc_probe(struct platform_device 
*pdev)
 *is write-only, and always reads as zero...)
 */
 
-   device_init_wakeup(pdev-dev, true);
-
if (new_ctrl  (u8) OMAP_RTC_CTRL_SPLIT)
pr_info(%s: split power mode\n, pdev-name);
 
@@ -495,6 +495,7 @@ static int __init omap_rtc_probe(struct platform_device 
*pdev)
return 0;
 
 fail0:
+   device_init_wakeup(pdev-dev, false);
if (id_entry-driver_data  OMAP_RTC_HAS_KICKER)
rtc_writel(0, OMAP_RTC_KICK0_REG);
pm_runtime_put_sync(pdev-dev);
-- 
2.0.4

--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html