From 166c1fda812678262fad9821b7295671ed2a75b6 Mon Sep 17 00:00:00 2001 From: Sekhar Nori Date: Wed, 27 Oct 2010 15:33:05 -0700 Subject: [PATCH] --- yaml --- r: 218495 b: refs/heads/master c: fa5b07820fe3a0fc06ac368516e71f10a59b9539 h: refs/heads/master i: 218493: f1a9de9a3071a747f4ac41807018c803046e68bf 218491: 1c386a6ac6866ad8c9291c2eaabf8ee69893f2b5 218487: 1e1c71e6bb0b53cd7167ef19b2a91c46c9d00c01 218479: ffb5933c36c253646aa2ff25f3fbb46c1c7c7ea4 218463: d499e6dee5630a7636e4e62575bb0868e533b0ef 218431: 652f7011ba1120b3b9fa61409abc6d7deb3e0d67 218367: 31b73434573625eebdd7febc9a5a7f1793a015be v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-omap.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index a8a91da722b8..504a1f94e986 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59cca865f21e9e7beab73fcf79ba4eb776a4c228 +refs/heads/master: fa5b07820fe3a0fc06ac368516e71f10a59b9539 diff --git a/trunk/drivers/rtc/rtc-omap.c b/trunk/drivers/rtc/rtc-omap.c index 64d9727b7229..73377b0d65da 100644 --- a/trunk/drivers/rtc/rtc-omap.c +++ b/trunk/drivers/rtc/rtc-omap.c @@ -34,7 +34,8 @@ * 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). See the BOARD-SPECIFIC CUSTOMIZATION comment. + * low power modes) for OMAP1 boards (OMAP-L138 has this built into + * the SoC). See the BOARD-SPECIFIC CUSTOMIZATION comment. */ #define OMAP_RTC_BASE 0xfffb4800 @@ -401,16 +402,17 @@ static int __init omap_rtc_probe(struct platform_device *pdev) /* BOARD-SPECIFIC CUSTOMIZATION CAN GO HERE: * - * - 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. + * - 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 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);