summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNarendra Damahe <ndamahe@nvidia.com>2010-07-07 12:53:08 -0700
committerGary King <gking@nvidia.com>2010-07-08 17:48:49 -0700
commit74311021fa83b871e7e053ed5f56af21bcda20eb (patch)
treed9075f512a905b05b8fea798acaacf434166fe03
parent34c8e5000624ba14f182bef994aa5e7d7f6645ff (diff)
[ARM/Tegra]enable internal RTC wake
enable internal RTC wake to support LP0 stress test. It clear all rtc interrupt to avoid immidiate wake from suspend. Change-Id: Ideacdb095a59b6a83f9becfdcb7356c884d29eb3 Reviewed-on: http://git-master/r/3634 Reviewed-by: Narendra Damahe <ndamahe@nvidia.com> Tested-by: Narendra Damahe <ndamahe@nvidia.com> Reviewed-by: Gary King <gking@nvidia.com>
-rw-r--r--arch/arm/mach-tegra/odm_kit/query/whistler/nvodm_query.c2
-rw-r--r--arch/arm/mach-tegra/tegra2_save.S6
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/odm_kit/query/whistler/nvodm_query.c b/arch/arm/mach-tegra/odm_kit/query/whistler/nvodm_query.c
index 4d9bc15fde07..40fde297bec0 100644
--- a/arch/arm/mach-tegra/odm_kit/query/whistler/nvodm_query.c
+++ b/arch/arm/mach-tegra/odm_kit/query/whistler/nvodm_query.c
@@ -581,7 +581,7 @@ static NvOdmWakeupPadInfo s_NvOdmWakeupPadInfo[] =
{NV_FALSE, 13, NvOdmWakeupPadPolarity_Low}, // Wake Event 13 - sdio1_dat1
{NV_FALSE, 14, NvOdmWakeupPadPolarity_AnyEdge}, // Wake Event 14 - gp3_pv[6] (WLAN_INT)
{NV_FALSE, 15, NvOdmWakeupPadPolarity_AnyEdge}, // Wake Event 15 - gmi_ad16 (SPI3_DOUT, DTV_SPI4_CS1)
- {NV_FALSE, 16, NvOdmWakeupPadPolarity_High}, // Wake Event 16 - rtc_irq
+ {NV_TRUE, 16, NvOdmWakeupPadPolarity_High}, // Wake Event 16 - rtc_irq
{NV_TRUE, 17, NvOdmWakeupPadPolarity_High}, // Wake Event 17 - kbc_interrupt
{NV_FALSE, 18, NvOdmWakeupPadPolarity_Low}, // Wake Event 18 - pwr_int (PMIC_INT)
{NV_FALSE, 19, NvOdmWakeupPadPolarity_AnyEdge}, // Wake Event 19 - usb_vbus_wakeup[0]
diff --git a/arch/arm/mach-tegra/tegra2_save.S b/arch/arm/mach-tegra/tegra2_save.S
index b5353803e0b5..167fe3fc2bcb 100644
--- a/arch/arm/mach-tegra/tegra2_save.S
+++ b/arch/arm/mach-tegra/tegra2_save.S
@@ -372,6 +372,11 @@ __tear_down_master_pll_cpu:
#if DEBUG_FORCE_RTC_WAKEUP_SEC
//r0 = RTC_BASE
mov32 r0, RTC_PA_BASE
+ /*Clear all RTC interrupts*/
+ mov r2, #0x1f
+ str r2, [r0, #0x2c]
+ mov r2, #0x0
+ str r2, [r0, #0x28]
//setup rtc wake
ldr r2, [r0, #0x10] /* milli */
ldr r2, [r0, #0x8] /* shadow */
@@ -389,7 +394,6 @@ rtc_idle2:
/* intr mask alarm0 */
mov r2, #1
str r2, [r0, #0x28]
- str r2, [r0, #0x2c]
rtc_idle3:
ldr r1, [r0, #0x4]
tst r1, #0x1