aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/rtc
diff options
context:
space:
mode:
authorKevin Hilman <khilman@deeprootsystems.com>2010-05-19 14:37:20 -0400
committerKevin Hilman <khilman@deeprootsystems.com>2010-05-19 14:37:20 -0400
commit5e682ef825302f2378726e44257291eaeadbfd50 (patch)
treec4b55e4d8705dd8dc7f374dfab46a0deb2edb7c7 /drivers/rtc
parent7735227e76e1660e448ec66c30e7bfd06f7cd9b7 (diff)
Revert "rtc: omap: let device wakeup capability be configured from chip init logic"
This reverts commit 9c0a342c45b2d98209ac473ea7a429ddd5c1b473 because it was included without proper signoffs from RTC maintainers.
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/rtc-omap.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index 73377b0d65da..64d9727b7229 100644
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@ -34,8 +34,7 @@
34 * Board-specific wiring options include using split power mode with 34 * Board-specific wiring options include using split power mode with
35 * RTC_OFF_NOFF used as the reset signal (so the RTC won't be reset), 35 * RTC_OFF_NOFF used as the reset signal (so the RTC won't be reset),
36 * and wiring RTC_WAKE_INT (so the RTC alarm can wake the system from 36 * and wiring RTC_WAKE_INT (so the RTC alarm can wake the system from
37 * low power modes) for OMAP1 boards (OMAP-L138 has this built into 37 * low power modes). See the BOARD-SPECIFIC CUSTOMIZATION comment.
38 * the SoC). See the BOARD-SPECIFIC CUSTOMIZATION comment.
39 */ 38 */
40 39
41#define OMAP_RTC_BASE 0xfffb4800 40#define OMAP_RTC_BASE 0xfffb4800
@@ -402,17 +401,16 @@ static int __init omap_rtc_probe(struct platform_device *pdev)
402 401
403 /* BOARD-SPECIFIC CUSTOMIZATION CAN GO HERE: 402 /* BOARD-SPECIFIC CUSTOMIZATION CAN GO HERE:
404 * 403 *
405 * - Device wake-up capability setting should come through chip 404 * - Boards wired so that RTC_WAKE_INT does something, and muxed
406 * init logic. OMAP1 boards should initialize the "wakeup capable" 405 * right (W13_1610_RTC_WAKE_INT is the default after chip reset),
407 * flag in the platform device if the board is wired right for 406 * should initialize the device wakeup flag appropriately.
408 * being woken up by RTC alarm. For OMAP-L138, this capability
409 * is built into the SoC by the "Deep Sleep" capability.
410 * 407 *
411 * - Boards wired so RTC_ON_nOFF is used as the reset signal, 408 * - Boards wired so RTC_ON_nOFF is used as the reset signal,
412 * rather than nPWRON_RESET, should forcibly enable split 409 * rather than nPWRON_RESET, should forcibly enable split
413 * power mode. (Some chip errata report that RTC_CTRL_SPLIT 410 * power mode. (Some chip errata report that RTC_CTRL_SPLIT
414 * is write-only, and always reads as zero...) 411 * is write-only, and always reads as zero...)
415 */ 412 */
413 device_init_wakeup(&pdev->dev, 0);
416 414
417 if (new_ctrl & (u8) OMAP_RTC_CTRL_SPLIT) 415 if (new_ctrl & (u8) OMAP_RTC_CTRL_SPLIT)
418 pr_info("%s: split power mode\n", pdev->name); 416 pr_info("%s: split power mode\n", pdev->name);