msm: 8064: Use PMIC GPIO 42 for rotation lock key
Rotation lock key uses PMIC GPIO 42. The previous configuration
using GPIO 46 is incorrect.
Change-Id: I1710f2229059aac1f20617c9e9e0c6b1356f612b
Signed-off-by: Jing Lin <jinglin@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-8064-gpiomux.c b/arch/arm/mach-msm/board-8064-gpiomux.c
index 206bebd..e8dfc21 100644
--- a/arch/arm/mach-msm/board-8064-gpiomux.c
+++ b/arch/arm/mach-msm/board-8064-gpiomux.c
@@ -502,28 +502,6 @@
},
};
-static struct gpiomux_setting gpio_rotate_key_act_config = {
- .pull = GPIOMUX_PULL_UP,
- .drv = GPIOMUX_DRV_8MA,
- .func = GPIOMUX_FUNC_GPIO,
-};
-
-static struct gpiomux_setting gpio_rotate_key_sus_config = {
- .pull = GPIOMUX_PULL_NONE,
- .drv = GPIOMUX_DRV_2MA,
- .func = GPIOMUX_FUNC_GPIO,
-};
-
-struct msm_gpiomux_config apq8064_rotate_key_config[] = {
- {
- .gpio = 46,
- .settings = {
- [GPIOMUX_SUSPENDED] = &gpio_rotate_key_sus_config,
- [GPIOMUX_ACTIVE] = &gpio_rotate_key_act_config,
- }
- },
-};
-
static struct msm_gpiomux_config apq8064_mxt_configs[] __initdata = {
{ /* TS INTERRUPT */
.gpio = 6,
@@ -629,8 +607,4 @@
if (machine_is_apq8064_cdp() || machine_is_apq8064_liquid())
msm_gpiomux_install(apq8064_mxt_configs,
ARRAY_SIZE(apq8064_mxt_configs));
-
- if (machine_is_apq8064_cdp() || machine_is_apq8064_liquid())
- msm_gpiomux_install(apq8064_rotate_key_config,
- ARRAY_SIZE(apq8064_rotate_key_config));
}
diff --git a/arch/arm/mach-msm/board-8064-pmic.c b/arch/arm/mach-msm/board-8064-pmic.c
index f4650a9..7f932f7 100644
--- a/arch/arm/mach-msm/board-8064-pmic.c
+++ b/arch/arm/mach-msm/board-8064-pmic.c
@@ -133,6 +133,7 @@
static struct pm8xxx_gpio_init pm8921_cdp_kp_gpios[] __initdata = {
PM8921_GPIO_INPUT(37, PM_GPIO_PULL_UP_1P5),
+ PM8921_GPIO_INPUT(42, PM_GPIO_PULL_UP_1P5),
};
/* Initial PM8XXX MPP configurations */
diff --git a/arch/arm/mach-msm/board-8064.c b/arch/arm/mach-msm/board-8064.c
index 03acf9d..35f17ce 100644
--- a/arch/arm/mach-msm/board-8064.c
+++ b/arch/arm/mach-msm/board-8064.c
@@ -1804,7 +1804,7 @@
#define GPIO_KEY_VOLUME_DOWN PM8921_GPIO_PM_TO_SYS(38)
#define GPIO_KEY_CAM_FOCUS PM8921_GPIO_PM_TO_SYS(3)
#define GPIO_KEY_CAM_SNAP PM8921_GPIO_PM_TO_SYS(4)
-#define GPIO_KEY_ROTATION 46
+#define GPIO_KEY_ROTATION PM8921_GPIO_PM_TO_SYS(42)
static struct gpio_keys_button cdp_keys[] = {
{