summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBharat Nihalani <bnihalani@nvidia.com>2010-07-05 17:07:50 +0530
committerBharat Nihalani <bnihalani@nvidia.com>2010-07-06 01:01:57 -0700
commit18d889a1c53eab1ffa114eeb784a3e8c419e77ad (patch)
tree7ad192092eefaf7081f78bbb7146d3ab0e79fd53
parent3f82f1aaa86b5e216c365c89756bd2b72996ea09 (diff)
[odm] whistler: enable KBC as wake-up eventtegra-10.7.1-ER
1. Currently RTC is the wake-up source for Whistler. Since RTC interrupt is not re-enabled, disabling it until it is fixed. Adding KBC as a wake-up source for Whistler. Verified to be working fine with LP0, but with LP1 2. Adding option to select LP1 / LP0 using nvflash option Change-Id: Iceb5e5f2f06c00a71b7a1d83f55ee2b00f8c3f01 Reviewed-on: http://git-master/r/3534 Tested-by: Bharat Nihalani <bnihalani@nvidia.com> Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
-rw-r--r--arch/arm/mach-tegra/odm_kit/query/whistler/nvodm_query.c7
1 files changed, 4 insertions, 3 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 be7979a..4d9bc15 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,8 +581,8 @@ 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_TRUE, 16, NvOdmWakeupPadPolarity_High}, // Wake Event 16 - rtc_irq
- {NV_FALSE, 17, NvOdmWakeupPadPolarity_High}, // Wake Event 17 - kbc_interrupt
+ {NV_FALSE, 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]
{NV_FALSE, 20, NvOdmWakeupPadPolarity_High}, // Wake Event 20 - usb_vbus_wakeup[1]
@@ -1216,7 +1216,8 @@ const NvOdmSocPowerStateInfo* NvOdmQueryLowestSocPowerState(void)
LPStateSelection = NV_DRF_VAL(TEGRA_DEVKIT, BCT_CUSTOPT, LPSTATE, LPStateSelection);
}
// Lowest power state controlled by the flashed custom option.
- PowerStateInfo.LowestPowerState = NvOdmSocPowerState_Suspend;
+ PowerStateInfo.LowestPowerState = ((LPStateSelection != TEGRA_DEVKIT_BCT_CUSTOPT_0_LPSTATE_LP1)?
+ NvOdmSocPowerState_Suspend : NvOdmSocPowerState_DeepSleep);
pPowerStateInfo = (const NvOdmSocPowerStateInfo*) &PowerStateInfo;
}
return (pPowerStateInfo);