diff options
| author | Simon Wilson <simonwilson@google.com> | 2012-02-02 16:43:05 -0800 |
|---|---|---|
| committer | Simon Wilson <simonwilson@google.com> | 2012-02-02 16:44:39 -0800 |
| commit | 665612374970f5dba43b65510b52b72130818541 (patch) | |
| tree | 806f5a60aac999c3f7603592bc9f70c27f476b98 | |
| parent | d373d5823387f4b753390de087baf2f3938a7dfb (diff) | |
| download | kernel_samsung_crespo-665612374970f5dba43b65510b52b72130818541.zip kernel_samsung_crespo-665612374970f5dba43b65510b52b72130818541.tar.gz kernel_samsung_crespo-665612374970f5dba43b65510b52b72130818541.tar.bz2 | |
ARM: s5pv210: herring: don't disable prox sensor during suspend
A previous change caused the proximity sensor to become
disabled during suspend to reduce power consumption , but this
needs to remain on if activated.
Change-Id: Idf5ac8df7d1e62f1644820d6590e28eb702ca83b
Signed-off-by: Simon Wilson <simonwilson@google.com>
| -rwxr-xr-x | arch/arm/mach-s5pv210/mach-herring.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pv210/mach-herring.c b/arch/arm/mach-s5pv210/mach-herring.c index be33104..29d77dd 100755 --- a/arch/arm/mach-s5pv210/mach-herring.c +++ b/arch/arm/mach-s5pv210/mach-herring.c @@ -4904,7 +4904,7 @@ static unsigned int herring_cdma_wimax_sleep_gpio_table[][3] = { { S5PV210_GPJ1(1), S3C_GPIO_SLP_OUT0, S3C_GPIO_PULL_NONE}, { S5PV210_GPJ1(2), S3C_GPIO_SLP_OUT0, S3C_GPIO_PULL_NONE}, { S5PV210_GPJ1(3), S3C_GPIO_SLP_OUT0, S3C_GPIO_PULL_NONE}, - { S5PV210_GPJ1(4), S3C_GPIO_SLP_OUT0, S3C_GPIO_PULL_NONE}, + { S5PV210_GPJ1(4), S3C_GPIO_SLP_PREV, S3C_GPIO_PULL_NONE}, { S5PV210_GPJ1(5), S3C_GPIO_SLP_OUT0, S3C_GPIO_PULL_NONE}, { S5PV210_GPJ2(0), S3C_GPIO_SLP_INPUT, S3C_GPIO_PULL_DOWN}, |