Input: pxa27x-keypad - use matrix_keymap for matrix keys
pxa27x-keypad includes matrix keys. Make use of matrix_keymap for the matrix keys. Signed-off-by: Chao Xie <chao.xie@marvell.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:

committed by
Dmitry Torokhov

parent
483180281f
commit
0a085a9482
@@ -140,7 +140,7 @@ static unsigned long palmz72_pin_config[] __initdata = {
|
||||
* GPIO keyboard
|
||||
******************************************************************************/
|
||||
#if defined(CONFIG_KEYBOARD_PXA27x) || defined(CONFIG_KEYBOARD_PXA27x_MODULE)
|
||||
static unsigned int palmz72_matrix_keys[] = {
|
||||
static const unsigned int palmz72_matrix_keys[] = {
|
||||
KEY(0, 0, KEY_POWER),
|
||||
KEY(0, 1, KEY_F1),
|
||||
KEY(0, 2, KEY_ENTER),
|
||||
@@ -156,11 +156,15 @@ static unsigned int palmz72_matrix_keys[] = {
|
||||
KEY(3, 2, KEY_LEFT),
|
||||
};
|
||||
|
||||
static struct matrix_keymap_data almz72_matrix_keymap_data = {
|
||||
.keymap = palmz72_matrix_keys,
|
||||
.keymap_size = ARRAY_SIZE(palmz72_matrix_keys),
|
||||
};
|
||||
|
||||
static struct pxa27x_keypad_platform_data palmz72_keypad_platform_data = {
|
||||
.matrix_key_rows = 4,
|
||||
.matrix_key_cols = 3,
|
||||
.matrix_key_map = palmz72_matrix_keys,
|
||||
.matrix_key_map_size = ARRAY_SIZE(palmz72_matrix_keys),
|
||||
.matrix_keymap_data = &almz72_matrix_keymap_data,
|
||||
|
||||
.debounce_interval = 30,
|
||||
};
|
||||
|
Reference in New Issue
Block a user