htcleo: switched to GP Timer and activated power collapse for nand

Thx to Cotulla
This commit is contained in:
Markinus 2010-10-12 21:46:44 +02:00
parent b84778b1c8
commit 5da4cedbdc
2 changed files with 13 additions and 9 deletions

View File

@ -244,20 +244,20 @@ CONFIG_HTC_SLEEP_MODE_GPIO_DUMP=y
# CONFIG_SMEM_RPC_SERVER_STATE is not set
# CONFIG_BUILD_OMA_DM is not set
CONFIG_CACHE_FLUSH_RANGE_LIMIT=0x40000
# CONFIG_MSM7X00A_USE_GP_TIMER is not set
CONFIG_MSM7X00A_USE_DG_TIMER=y
# CONFIG_MSM7X00A_SLEEP_MODE_POWER_COLLAPSE_SUSPEND is not set
CONFIG_MSM7X00A_USE_GP_TIMER=y
# CONFIG_MSM7X00A_USE_DG_TIMER is not set
CONFIG_MSM7X00A_SLEEP_MODE_POWER_COLLAPSE_SUSPEND=y
# CONFIG_MSM7X00A_SLEEP_MODE_POWER_COLLAPSE is not set
CONFIG_MSM7X00A_SLEEP_MODE_APPS_SLEEP=y
# CONFIG_MSM7X00A_SLEEP_MODE_APPS_SLEEP is not set
# CONFIG_MSM7X00A_SLEEP_MODE_RAMP_DOWN_AND_WAIT_FOR_INTERRUPT is not set
# CONFIG_MSM7X00A_SLEEP_WAIT_FOR_INTERRUPT is not set
CONFIG_MSM7X00A_SLEEP_MODE=2
# CONFIG_MSM7X00A_IDLE_SLEEP_MODE_POWER_COLLAPSE_SUSPEND is not set
CONFIG_MSM7X00A_SLEEP_MODE=0
CONFIG_MSM7X00A_IDLE_SLEEP_MODE_POWER_COLLAPSE_SUSPEND=y
# CONFIG_MSM7X00A_IDLE_SLEEP_MODE_POWER_COLLAPSE is not set
CONFIG_MSM7X00A_IDLE_SLEEP_MODE_APPS_SLEEP=y
# CONFIG_MSM7X00A_IDLE_SLEEP_MODE_APPS_SLEEP is not set
# CONFIG_MSM7X00A_IDLE_SLEEP_MODE_RAMP_DOWN_AND_WAIT_FOR_INTERRUPT is not set
# CONFIG_MSM7X00A_IDLE_SLEEP_WAIT_FOR_INTERRUPT is not set
CONFIG_MSM7X00A_IDLE_SLEEP_MODE=2
CONFIG_MSM7X00A_IDLE_SLEEP_MODE=0
CONFIG_MSM7X00A_IDLE_SLEEP_MIN_TIME=50000000
CONFIG_MSM7X00A_IDLE_SPIN_TIME=80000
CONFIG_MSM7X00A_SLEEP_NO_LIMIT=y

View File

@ -47,6 +47,7 @@
#ifdef CONFIG_HAS_WAKELOCK
#include <linux/wakelock.h>
#endif
#include "board-htcleo.h"
enum {
MSM_PM_DEBUG_SUSPEND = 1U << 0,
@ -269,7 +270,10 @@ static int msm_sleep(int sleep_mode, uint32_t sleep_delay, int from_idle)
int ret;
int rv = -EINTR;
bool invalid_inital_state = false;
#if defined(CONFIG_MACH_HTCLEO)
if(!htcleo_is_nand_boot() && sleep_mode<2)
sleep_mode=2;
#endif
if (board_mfg_mode() == 4) /*power test mode*/
gpio_set_diag_gpio_table(board_get_mfg_sleep_gpio_table());