[msm7x27a]: Add support for fastboot and recovery key.
Change-Id: I3f417594889fe6332ab327ac199de7586e123b4f
diff --git a/target/msm7627a/keypad.c b/target/msm7627a/keypad.c
index c51c015..354e632 100644
--- a/target/msm7627a/keypad.c
+++ b/target/msm7627a/keypad.c
@@ -38,61 +38,41 @@
/* don't turn this on without updating the ffa support */
#define SCAN_FUNCTION_KEYS 0
-static unsigned int halibut_row_gpios[] = {
- 31, 32, 33, 34, 35, 41
-#if SCAN_FUNCTION_KEYS
- , 42
-#endif
-};
-
-static unsigned int halibut_col_gpios[] = { 36, 37, 38, 39, 40 };
+static unsigned int halibut_row_gpios[] = {31, 32, 33, 34, 35};
+static unsigned int halibut_col_gpios[] = {36, 37, 38, 39, 40};
#define KEYMAP_INDEX(row, col) ((row)*ARRAY_SIZE(halibut_col_gpios) + (col))
static const unsigned short halibut_keymap[ARRAY_SIZE(halibut_col_gpios) * ARRAY_SIZE(halibut_row_gpios)] = {
- [KEYMAP_INDEX(0, 0)] = KEY_5,
- [KEYMAP_INDEX(0, 1)] = KEY_9,
- [KEYMAP_INDEX(0, 2)] = KEY_SOFT1,
- [KEYMAP_INDEX(0, 3)] = KEY_6,
- [KEYMAP_INDEX(0, 4)] = KEY_LEFT,
+ [KEYMAP_INDEX(0, 0)] = KEY_7,
+ [KEYMAP_INDEX(0, 1)] = KEY_DOWN,
+ [KEYMAP_INDEX(0, 2)] = KEY_UP,
+ [KEYMAP_INDEX(0, 3)] = KEY_RIGHT,
+ [KEYMAP_INDEX(0, 4)] = KEY_CENTER,
- [KEYMAP_INDEX(1, 0)] = KEY_0,
- [KEYMAP_INDEX(1, 1)] = KEY_RIGHT,
+ [KEYMAP_INDEX(1, 0)] = KEY_LEFT,
+ [KEYMAP_INDEX(1, 1)] = KEY_SEND,
[KEYMAP_INDEX(1, 2)] = KEY_1,
- [KEYMAP_INDEX(1, 3)] = KEY_SHARP,
- [KEYMAP_INDEX(1, 4)] = KEY_SEND,
+ [KEYMAP_INDEX(1, 3)] = KEY_4,
+ [KEYMAP_INDEX(1, 4)] = KEY_CLEAR,
- [KEYMAP_INDEX(2, 0)] = KEY_VOLUMEUP,
- [KEYMAP_INDEX(2, 1)] = KEY_HOME, /* FA */
- [KEYMAP_INDEX(2, 2)] = KEY_F8, /* QCHT */
- [KEYMAP_INDEX(2, 3)] = KEY_F6, /* R+ */
- [KEYMAP_INDEX(2, 4)] = KEY_F7, /* R- */
+ [KEYMAP_INDEX(2, 0)] = KEY_6,
+ [KEYMAP_INDEX(2, 1)] = KEY_5,
+ [KEYMAP_INDEX(2, 2)] = KEY_8,
+ [KEYMAP_INDEX(2, 3)] = KEY_3,
+ [KEYMAP_INDEX(2, 4)] = KEY_STAR,
- [KEYMAP_INDEX(3, 0)] = KEY_UP,
- [KEYMAP_INDEX(3, 1)] = KEY_CLEAR,
- [KEYMAP_INDEX(3, 2)] = KEY_4,
- [KEYMAP_INDEX(3, 3)] = KEY_MUTE, /* SPKR */
- [KEYMAP_INDEX(3, 4)] = KEY_2,
+ [KEYMAP_INDEX(3, 0)] = KEY_9,
+ [KEYMAP_INDEX(3, 1)] = KEY_SOFT1,
+ [KEYMAP_INDEX(3, 2)] = KEY_0,
+ [KEYMAP_INDEX(3, 3)] = KEY_2,
+ [KEYMAP_INDEX(3, 4)] = KEY_SOFT2,
- [KEYMAP_INDEX(4, 0)] = KEY_SOFT2, /* SOFT2 */
- [KEYMAP_INDEX(4, 1)] = KEY_CENTER, /* KEY_CENTER */
- [KEYMAP_INDEX(4, 2)] = KEY_DOWN,
- [KEYMAP_INDEX(4, 3)] = KEY_BACK, /* FB */
- [KEYMAP_INDEX(4, 4)] = KEY_8,
-
- [KEYMAP_INDEX(5, 0)] = KEY_VOLUMEDOWN,
- [KEYMAP_INDEX(5, 1)] = KEY_STAR, /* KEY_STAR */
- [KEYMAP_INDEX(5, 2)] = KEY_MAIL, /* MESG */
- [KEYMAP_INDEX(5, 3)] = KEY_3,
- [KEYMAP_INDEX(5, 4)] = KEY_7,
-
-#if SCAN_FUNCTION_KEYS
- [KEYMAP_INDEX(6, 0)] = KEY_F5,
- [KEYMAP_INDEX(6, 1)] = KEY_F4,
- [KEYMAP_INDEX(6, 2)] = KEY_F3,
- [KEYMAP_INDEX(6, 3)] = KEY_F2,
- [KEYMAP_INDEX(6, 4)] = KEY_F1
-#endif
+ [KEYMAP_INDEX(4, 0)] = KEY_MENU, /*R-*/
+ [KEYMAP_INDEX(4, 1)] = KEY_HOME, /*L+*/
+ [KEYMAP_INDEX(4, 2)] = KEY_BACK, /*L-*/
+ [KEYMAP_INDEX(4, 3)] = KEY_VOLUMEUP,
+ [KEYMAP_INDEX(4, 4)] = KEY_VOLUMEDOWN,
};
static struct gpio_keypad_info halibut_keypad_info = {
@@ -103,7 +83,7 @@
.ninputs = ARRAY_SIZE(halibut_col_gpios),
.settle_time = 5 /* msec */,
.poll_time = 20 /* msec */,
- .flags = GPIOKPF_DRIVE_INACTIVE,
+ .flags = (GPIOKPF_DRIVE_INACTIVE | GPIOKPF_ACTIVE_HIGH),
};
void keypad_init(void)