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
@@ -222,7 +222,7 @@ static struct pxafb_mach_info mioa701_pxafb_info = {
|
||||
/*
|
||||
* Keyboard configuration
|
||||
*/
|
||||
static unsigned int mioa701_matrix_keys[] = {
|
||||
static const unsigned int mioa701_matrix_keys[] = {
|
||||
KEY(0, 0, KEY_UP),
|
||||
KEY(0, 1, KEY_RIGHT),
|
||||
KEY(0, 2, KEY_MEDIA),
|
||||
@@ -233,11 +233,16 @@ static unsigned int mioa701_matrix_keys[] = {
|
||||
KEY(2, 1, KEY_PHONE), /* Phone Green key */
|
||||
KEY(2, 2, KEY_CAMERA) /* Camera key */
|
||||
};
|
||||
|
||||
static struct matrix_keymap_data mioa701_matrix_keymap_data = {
|
||||
.keymap = mioa701_matrix_keys,
|
||||
.keymap_size = ARRAY_SIZE(mioa701_matrix_keys),
|
||||
};
|
||||
|
||||
static struct pxa27x_keypad_platform_data mioa701_keypad_info = {
|
||||
.matrix_key_rows = 3,
|
||||
.matrix_key_cols = 3,
|
||||
.matrix_key_map = mioa701_matrix_keys,
|
||||
.matrix_key_map_size = ARRAY_SIZE(mioa701_matrix_keys),
|
||||
.matrix_keymap_data = &mioa701_matrix_keymap_data,
|
||||
};
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user