[PATCH] mach-mx3/mach-mx31_3ds: update keypad registration
Eric Bénard
eric at eukrea.com
Thu Jun 17 14:59:06 EDT 2010
depends on "input/imx_keypad: add PM support"
Note : this patch is not tested
Signed-off-by: Eric Bénard <eric at eukrea.com>
Cc: s.hauer at pengutronix.de
Cc: linux-arm-kernel at lists.infradead.org
Cc: maramaopercheseimorto at gmail.com
---
arch/arm/mach-mx3/mach-mx31_3ds.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-mx3/mach-mx31_3ds.c b/arch/arm/mach-mx3/mach-mx31_3ds.c
index 58e5729..04c8700 100644
--- a/arch/arm/mach-mx3/mach-mx31_3ds.c
+++ b/arch/arm/mach-mx3/mach-mx31_3ds.c
@@ -114,6 +114,11 @@ static struct matrix_keymap_data mx31_3ds_keymap_data = {
.keymap_size = ARRAY_SIZE(mx31_3ds_keymap),
};
+static struct matrix_keypad_platform_data mx31_3ds_keypad_data = {
+ .keymap_data = &mx31_3ds_keymap_data,
+ .wakeup = 1,
+};
+
/* Regulators */
static struct regulator_init_data pwgtx_init = {
.constraints = {
@@ -397,7 +402,7 @@ static void __init mxc_board_init(void)
spi_register_board_info(mx31_3ds_spi_devs,
ARRAY_SIZE(mx31_3ds_spi_devs));
- mxc_register_device(&imx_kpp_device, &mx31_3ds_keymap_data);
+ mxc_register_device(&imx_kpp_device, &mx31_3ds_keypad_data);
mx31_3ds_usbotg_init();
mxc_register_device(&mxc_otg_udc_device, &usbotg_pdata);
--
1.6.3.3
More information about the linux-arm-kernel
mailing list