diff options
| author | Narendra Damahe <ndamahe@nvidia.com> | 2010-04-22 11:50:55 -0700 |
|---|---|---|
| committer | Gary King <gking@nvidia.com> | 2010-04-22 20:53:19 -0700 |
| commit | 1a7037fc2f4a8129fadd189a32b946d31535b1d9 (patch) | |
| tree | 9691a96b888fe45270211f984dbca0fa20263045 | |
| parent | c8902bbab78d5db92547ee9c2e5aa4c91530e304 (diff) | |
tegra:making suspend(lp1) as default low power state
Also disabling sd card detect as a wake source for harmony
Change-Id: If826e916847b44086c531b63938861a47718b7da
Reviewed-on: http://git-master/r/1183
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/harmony/nvodm_query.c | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | arch/arm/mach-tegra/odm_kit/query/whistler/nvodm_query.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/odm_kit/query/harmony/nvodm_query.c b/arch/arm/mach-tegra/odm_kit/query/harmony/nvodm_query.c index 1ffee20bbfc7..9d8987bb2cae 100644 --- a/arch/arm/mach-tegra/odm_kit/query/harmony/nvodm_query.c +++ b/arch/arm/mach-tegra/odm_kit/query/harmony/nvodm_query.c @@ -321,7 +321,7 @@ static NvOdmWakeupPadInfo s_NvOdmWakeupPadInfo[] = {NV_FALSE, 20, NvOdmWakeupPadPolarity_High}, // Wake Event 20 - usb_vbus_wakeup[1] {NV_FALSE, 21, NvOdmWakeupPadPolarity_Low}, // Wake Event 21 - usb_iddig[0] {NV_FALSE, 22, NvOdmWakeupPadPolarity_Low}, // Wake Event 22 - usb_iddig[1] - {NV_TRUE, 23, NvOdmWakeupPadPolarity_Low}, // Wake Event 23 - gmi_iordy (HSMMC_CLK) + {NV_FALSE, 23, NvOdmWakeupPadPolarity_Low}, // Wake Event 23 - gmi_iordy (HSMMC_CLK) {NV_FALSE, 24, NvOdmWakeupPadPolarity_High}, // Wake Event 24 - gp3_pv[2] (BB_MOD, MODEM WAKEUP_AP15, SPI-SS) {NV_FALSE, 25, NvOdmWakeupPadPolarity_High}, // Wake Event 25 - gp3_ps[4] (KB_COL12) {NV_FALSE, 26, NvOdmWakeupPadPolarity_High}, // Wake Event 26 - gp3_ps[5] (KB_COL10) @@ -704,7 +704,7 @@ 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 = ((LPStateSelection == TEGRA_DEVKIT_BCT_CUSTOPT_0_LPSTATE_LP1)? + PowerStateInfo.LowestPowerState = ((LPStateSelection != TEGRA_DEVKIT_BCT_CUSTOPT_0_LPSTATE_LP1)? NvOdmSocPowerState_Suspend : NvOdmSocPowerState_DeepSleep); pPowerStateInfo = (const NvOdmSocPowerStateInfo*) &PowerStateInfo; } 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 9451d8b40abe..865ffad93220 100755..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 @@ -1191,7 +1191,7 @@ 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 = ((LPStateSelection == TEGRA_DEVKIT_BCT_CUSTOPT_0_LPSTATE_LP1)? + PowerStateInfo.LowestPowerState = ((LPStateSelection != TEGRA_DEVKIT_BCT_CUSTOPT_0_LPSTATE_LP1)? NvOdmSocPowerState_Suspend : NvOdmSocPowerState_DeepSleep); pPowerStateInfo = (const NvOdmSocPowerStateInfo*) &PowerStateInfo; } |