Input: pxa27x-keypad - use matrix_keymap for matrix keys

[karo-tx-linux.git] / arch / arm / mach-pxa / z2.c

diff --git a/arch/arm/mach-pxa/z2.c b/arch/arm/mach-pxa/z2.c
index 989903a7e467c2451a2594970c87492046f723d4..2513d8f4931f49675dfd8322edd03c2ffbd3ca0f 100644 (file)
--- a/arch/arm/mach-pxa/z2.c
+++ b/arch/arm/mach-pxa/z2.c
@@ -345,7 +345,7 @@ static inline void z2_leds_init(void) {}
  * GPIO keyboard
  ******************************************************************************/
 #if defined(CONFIG_KEYBOARD_PXA27x) || defined(CONFIG_KEYBOARD_PXA27x_MODULE)
-static unsigned int z2_matrix_keys[] = {
+static const unsigned int z2_matrix_keys[] = {
        KEY(0, 0, KEY_OPTION),
        KEY(1, 0, KEY_UP),
        KEY(2, 0, KEY_DOWN),
@@ -405,11 +405,15 @@ static unsigned int z2_matrix_keys[] = {
        KEY(5, 7, KEY_DOT),
 };
 
+static struct matrix_keymap_data z2_matrix_keymap_data = {
+       .keymap                 = z2_matrix_keys,
+       .keymap_size            = ARRAY_SIZE(z2_matrix_keys),
+};
+
 static struct pxa27x_keypad_platform_data z2_keypad_platform_data = {
        .matrix_key_rows        = 7,
        .matrix_key_cols        = 8,
-       .matrix_key_map         = z2_matrix_keys,
-       .matrix_key_map_size    = ARRAY_SIZE(z2_matrix_keys),
+       .matrix_keymap_data     = &z2_matrix_keymap_data,
 
        .debounce_interval      = 30,
 };