Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "rtc: omap: let device wakeup capability be configured from chip init logic"

Browse source 
This reverts commit 9c0a342c45 because
it was included without proper signoffs from RTC maintainers.
This commit is contained in:
Kevin Hilman 2010-05-19 11:37:20 -07:00
parent 7735227e76
commit 5e682ef825
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/rtc/rtc-omap.c
View file

@ -34,8 +34,7 @@
* Board-specific wiring options include using split power mode with * 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), * 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 * 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 * low power modes). See the BOARD-SPECIFIC CUSTOMIZATION comment.
* the SoC). See the BOARD-SPECIFIC CUSTOMIZATION comment.
*/ */
#define OMAP_RTC_BASE 0xfffb4800 #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: /* BOARD-SPECIFIC CUSTOMIZATION CAN GO HERE:
* *
* - Device wake-up capability setting should come through chip * - Boards wired so that RTC_WAKE_INT does something, and muxed
* init logic. OMAP1 boards should initialize the "wakeup capable" * right (W13_1610_RTC_WAKE_INT is the default after chip reset),
* flag in the platform device if the board is wired right for * should initialize the device wakeup flag appropriately.
* 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, * - Boards wired so RTC_ON_nOFF is used as the reset signal,
* rather than nPWRON_RESET, should forcibly enable split * rather than nPWRON_RESET, should forcibly enable split
* power mode. (Some chip errata report that RTC_CTRL_SPLIT * power mode. (Some chip errata report that RTC_CTRL_SPLIT
* is write-only, and always reads as zero...) * is write-only, and always reads as zero...)
*/ */
device_init_wakeup(&pdev->dev, 0);
if (new_ctrl & (u8) OMAP_RTC_CTRL_SPLIT) if (new_ctrl & (u8) OMAP_RTC_CTRL_SPLIT)
pr_info("%s: split power mode\n", pdev->name); pr_info("%s: split power mode\n", pdev->name);