diff options
| author | Chethan Krishna N <chethan.krishna@stericsson.com> | 2011-07-26 12:37:10 +0530 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 16:05:52 +0200 |
| commit | 35069f6b0f4f6de5e803540c1c0c72251bbeb271 (patch) | |
| tree | aa9b53d9d5be9b557006df5e00eaca35aefb4352 /arch/arm/mach-ux500/board-u5500.c | |
| parent | 990e4453add6278571caaa1b04b610f31ccf7cf0 (diff) | |
db5500_keypad: don't configure all keypad pins
Some keypad pins are not connected to keypad controller,
do not configure them.
ST-Ericsson ID: 353260
ST-Ericsson FOSS-OUT ID: NA
ST-Ericsson Linux next: NA
Change-Id: I4943a3febe4ad38c4e7322638c49ac91d838271a
Signed-off-by: Chethan Krishna N <chethan.krishna@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/27885
Reviewed-by: QATOOLS
Reviewed-by: QATEST
Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29725
Reviewed-by: Naga RADHESH Y <naga.radheshy@stericsson.com>
Tested-by: Naga RADHESH Y <naga.radheshy@stericsson.com>
Diffstat (limited to 'arch/arm/mach-ux500/board-u5500.c')
| -rw-r--r-- | arch/arm/mach-ux500/board-u5500.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/arch/arm/mach-ux500/board-u5500.c b/arch/arm/mach-ux500/board-u5500.c index b5a911b6cae..44a00c4478f 100644 --- a/arch/arm/mach-ux500/board-u5500.c +++ b/arch/arm/mach-ux500/board-u5500.c @@ -230,27 +230,15 @@ static struct i2c_board_info __initdata u5500_i2c2_devices[] = { #define ROW_PIN_I1 130 #define ROW_PIN_I2 132 #define ROW_PIN_I3 134 -#define ROW_PIN_I4 136 -#define ROW_PIN_I5 138 -#define ROW_PIN_I6 140 -#define ROW_PIN_I7 142 -#define COL_PIN_O0 129 -#define COL_PIN_O1 131 -#define COL_PIN_O2 133 -#define COL_PIN_O3 135 #define COL_PIN_O4 137 #define COL_PIN_O5 139 -#define COL_PIN_O6 141 -#define COL_PIN_O7 143 static int db5500_kp_rows[] = { ROW_PIN_I0, ROW_PIN_I1, ROW_PIN_I2, ROW_PIN_I3, - ROW_PIN_I4, ROW_PIN_I5, ROW_PIN_I6, ROW_PIN_I7, }; static int db5500_kp_cols[] = { - COL_PIN_O0, COL_PIN_O1, COL_PIN_O2, COL_PIN_O3, - COL_PIN_O4, COL_PIN_O5, COL_PIN_O6, COL_PIN_O7, + COL_PIN_O4, COL_PIN_O5, }; static bool db5500_config; @@ -285,7 +273,7 @@ static int db5500_kp_init(void) if (pins) ux500_pins_enable(pins); - for (i = 0; i < KEYPAD_MAX_ROWS - 1; i++) { + for (i = 0; i < ARRAY_SIZE(db5500_kp_rows); i++) { ret = db5500_set_gpio_row(db5500_kp_rows[i]); if (ret < 0) { pr_err("db5500_kp_init: failed init\n"); @@ -339,6 +327,8 @@ static struct db5500_keypad_platform_data u5500_keypad_board = { .gpio_output_pins = db5500_kp_cols, .keymap_data = &u5500_keymap_data, .no_autorepeat = true, + .krow = ARRAY_SIZE(db5500_kp_rows), + .kcol = ARRAY_SIZE(db5500_kp_cols), .debounce_ms = 40, /* milliseconds */ .switch_delay = 200, /* in jiffies */ }; |