diff options
| author | Inderpal Singh <inderpal.singh@linaro.org> | 2011-07-22 15:13:32 +0530 |
|---|---|---|
| committer | Angus Ainslie <angus.ainslie@linaro.org> | 2011-08-18 17:15:36 -0600 |
| commit | fe8fc9cc501dc45d721d3ad94fac89edf4c5a815 (patch) | |
| tree | 0bfb7205c7807c5ee0593824a4b362195c10f59d | |
| parent | 2a546336725ccd77bef3f9d99494555c6ca52848 (diff) | |
ARM: EXYNOS4: Fix wrong GPIO settings in origen button driver
1. Fix wrong GPIO configuration which causes immediate resume after suspend
2. Switch case changed to 0 to release the GPIOs properly
Signed-off-by: Inderpal Singh <inderpal.singh@linaro.org>
Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org>
| -rw-r--r-- | arch/arm/mach-exynos4/dev-button.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-exynos4/dev-button.c b/arch/arm/mach-exynos4/dev-button.c index f076e8609ea7..c0cb1223684f 100644 --- a/arch/arm/mach-exynos4/dev-button.c +++ b/arch/arm/mach-exynos4/dev-button.c @@ -40,12 +40,14 @@ static int origen_cfg_button(int enable) goto error; } } - s3c_gpio_cfgrange_nopull(EXYNOS4_GPX1(5), 3, 0xF); - s3c_gpio_cfgrange_nopull(EXYNOS4_GPX2(0), 2, 0xF); + s3c_gpio_cfgrange_nopull(EXYNOS4_GPX1(5), 3, + S3C_GPIO_SFN(0xF)); + s3c_gpio_cfgrange_nopull(EXYNOS4_GPX2(0), 2, + S3C_GPIO_SFN(0xF)); return 0; error: return -1; - case 2: + case 0: for(i = 5; i < 8; i++) gpio_free(EXYNOS4_GPX1(5)); for(i = 0; i < 2; i++) |