From 76f7c67d1ba7d74fc4f270132485274d5211c9d8 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Wed, 19 May 2010 11:37:20 -0700 Subject: [PATCH] --- yaml --- r: 192126 b: refs/heads/master c: 5e682ef825302f2378726e44257291eaeadbfd50 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-omap.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 46a24e1f452f..bb154f45870b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7735227e76e1660e448ec66c30e7bfd06f7cd9b7 +refs/heads/master: 5e682ef825302f2378726e44257291eaeadbfd50 diff --git a/trunk/drivers/rtc/rtc-omap.c b/trunk/drivers/rtc/rtc-omap.c index 73377b0d65da..64d9727b7229 100644 --- a/trunk/drivers/rtc/rtc-omap.c +++ b/trunk/drivers/rtc/rtc-omap.c @@ -34,8 +34,7 @@ * Board-specific wiring options include using split power mode with * RTC_OFF_NOFF used as the reset signal (so the RTC won't be reset), * and wiring RTC_WAKE_INT (so the RTC alarm can wake the system from - * low power modes) for OMAP1 boards (OMAP-L138 has this built into - * the SoC). See the BOARD-SPECIFIC CUSTOMIZATION comment. + * low power modes). See the BOARD-SPECIFIC CUSTOMIZATION comment. */ #define OMAP_RTC_BASE 0xfffb4800 @@ -402,17 +401,16 @@ static int __init omap_rtc_probe(struct platform_device *pdev) /* BOARD-SPECIFIC CUSTOMIZATION CAN GO HERE: * - * - Device wake-up capability setting should come through chip - * init logic. OMAP1 boards should initialize the "wakeup capable" - * flag in the platform device if the board is wired right for - * being woken up by RTC alarm. For OMAP-L138, this capability - * is built into the SoC by the "Deep Sleep" capability. + * - Boards wired so that RTC_WAKE_INT does something, and muxed + * right (W13_1610_RTC_WAKE_INT is the default after chip reset), + * should initialize the device wakeup flag appropriately. * * - Boards wired so RTC_ON_nOFF is used as the reset signal, * rather than nPWRON_RESET, should forcibly enable split * power mode. (Some chip errata report that RTC_CTRL_SPLIT * is write-only, and always reads as zero...) */ + device_init_wakeup(&pdev->dev, 0); if (new_ctrl & (u8) OMAP_RTC_CTRL_SPLIT) pr_info("%s: split power mode\n", pdev->name);