diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-10 03:58:56 -0500 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-17 04:01:32 -0500 |
commit | 3f880141b8d12cdbb5faf0b9941ee50ac515ea1e (patch) | |
tree | ad50ed7f31b47c4375d48df0a4c54e655423adc1 /arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | |
parent | bd455ed36c487b949068182bfee478b785ee090b (diff) |
ARM: imx: dynamically allocate imx-keypad devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/eukrea_mbimx27-baseboard.c')
-rw-r--r-- | arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c index fa5aaded7c2e..3aaa3b9b604c 100644 --- a/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c +++ b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <linux/spi/ads7846.h> | 26 | #include <linux/spi/ads7846.h> |
27 | #include <linux/backlight.h> | 27 | #include <linux/backlight.h> |
28 | #include <video/platform_lcd.h> | 28 | #include <video/platform_lcd.h> |
29 | #include <linux/input/matrix_keypad.h> | ||
30 | 29 | ||
31 | #include <asm/mach/arch.h> | 30 | #include <asm/mach/arch.h> |
32 | 31 | ||
@@ -109,7 +108,8 @@ static const uint32_t eukrea_mbimx27_keymap[] = { | |||
109 | KEY(1, 1, KEY_LEFT), | 108 | KEY(1, 1, KEY_LEFT), |
110 | }; | 109 | }; |
111 | 110 | ||
112 | static struct matrix_keymap_data eukrea_mbimx27_keymap_data = { | 111 | static const struct matrix_keymap_data |
112 | eukrea_mbimx27_keymap_data __initconst = { | ||
113 | .keymap = eukrea_mbimx27_keymap, | 113 | .keymap = eukrea_mbimx27_keymap, |
114 | .keymap_size = ARRAY_SIZE(eukrea_mbimx27_keymap), | 114 | .keymap_size = ARRAY_SIZE(eukrea_mbimx27_keymap), |
115 | }; | 115 | }; |
@@ -384,7 +384,7 @@ void __init eukrea_mbimx27_baseboard_init(void) | |||
384 | gpio_request(GPIO_PORTA | 25, "lcd_enable"); | 384 | gpio_request(GPIO_PORTA | 25, "lcd_enable"); |
385 | platform_device_register(&eukrea_mbimx27_lcd_powerdev); | 385 | platform_device_register(&eukrea_mbimx27_lcd_powerdev); |
386 | 386 | ||
387 | mxc_register_device(&imx_kpp_device, &eukrea_mbimx27_keymap_data); | 387 | imx27_add_imx_keypad(&eukrea_mbimx27_keymap_data); |
388 | 388 | ||
389 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); | 389 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); |
390 | } | 390 | } |