From: "Komal Shah" This patch adds keymapsize, delay and debounce flag in the keypad platform data for various TI OMAP1/2 based boards like F-sample, H2, H3, Innovator, Nokia770, OSK, Perseus and H4. Signed-off-by: Komal Shah Cc: Russell King Signed-off-by: Andrew Morton --- arch/arm/mach-omap1/board-fsample.c | 8 +++++--- arch/arm/mach-omap1/board-h2.c | 11 +++++++---- arch/arm/mach-omap1/board-h3.c | 11 +++++++---- arch/arm/mach-omap1/board-innovator.c | 8 +++++--- arch/arm/mach-omap1/board-nokia770.c | 8 +++++--- arch/arm/mach-omap1/board-osk.c | 8 +++++--- arch/arm/mach-omap1/board-perseus2.c | 9 ++++++--- arch/arm/mach-omap2/board-h4.c | 1 + 8 files changed, 41 insertions(+), 23 deletions(-) diff -puN arch/arm/mach-omap1/board-fsample.c~omap-update-omap1-2-boards-to-give-keymapsize-and-other arch/arm/mach-omap1/board-fsample.c --- a/arch/arm/mach-omap1/board-fsample.c~omap-update-omap1-2-boards-to-give-keymapsize-and-other +++ a/arch/arm/mach-omap1/board-fsample.c @@ -172,9 +172,11 @@ static struct resource kp_resources[] = }; static struct omap_kp_platform_data kp_data = { - .rows = 8, - .cols = 8, - .keymap = fsample_keymap, + .rows = 8, + .cols = 8, + .keymap = fsample_keymap, + .keymapsize = ARRAY_SIZE(fsample_keymap), + .delay = 4, }; static struct platform_device kp_device = { diff -puN arch/arm/mach-omap1/board-h2.c~omap-update-omap1-2-boards-to-give-keymapsize-and-other arch/arm/mach-omap1/board-h2.c --- a/arch/arm/mach-omap1/board-h2.c~omap-update-omap1-2-boards-to-give-keymapsize-and-other +++ a/arch/arm/mach-omap1/board-h2.c @@ -167,10 +167,13 @@ static struct resource h2_kp_resources[] }; static struct omap_kp_platform_data h2_kp_data = { - .rows = 8, - .cols = 8, - .keymap = h2_keymap, - .rep = 1, + .rows = 8, + .cols = 8, + .keymap = h2_keymap, + .keymapsize = ARRAY_SIZE(h2_keymap), + .rep = 1, + .delay = 9, + .dbounce = 1, }; static struct platform_device h2_kp_device = { diff -puN arch/arm/mach-omap1/board-h3.c~omap-update-omap1-2-boards-to-give-keymapsize-and-other arch/arm/mach-omap1/board-h3.c --- a/arch/arm/mach-omap1/board-h3.c~omap-update-omap1-2-boards-to-give-keymapsize-and-other +++ a/arch/arm/mach-omap1/board-h3.c @@ -247,10 +247,13 @@ static struct resource h3_kp_resources[] }; static struct omap_kp_platform_data h3_kp_data = { - .rows = 8, - .cols = 8, - .keymap = h3_keymap, - .rep = 1, + .rows = 8, + .cols = 8, + .keymap = h3_keymap, + .keymapsize = ARRAY_SIZE(h3_keymap), + .rep = 1, + .delay = 9, + .dbounce = 1, }; static struct platform_device h3_kp_device = { diff -puN arch/arm/mach-omap1/board-innovator.c~omap-update-omap1-2-boards-to-give-keymapsize-and-other arch/arm/mach-omap1/board-innovator.c --- a/arch/arm/mach-omap1/board-innovator.c~omap-update-omap1-2-boards-to-give-keymapsize-and-other +++ a/arch/arm/mach-omap1/board-innovator.c @@ -159,9 +159,11 @@ static struct resource innovator_kp_reso }; static struct omap_kp_platform_data innovator_kp_data = { - .rows = 8, - .cols = 8, - .keymap = innovator_keymap, + .rows = 8, + .cols = 8, + .keymap = innovator_keymap, + .keymapsize = ARRAY_SIZE(innovator_keymap), + .delay = 4, }; static struct platform_device innovator_kp_device = { diff -puN arch/arm/mach-omap1/board-nokia770.c~omap-update-omap1-2-boards-to-give-keymapsize-and-other arch/arm/mach-omap1/board-nokia770.c --- a/arch/arm/mach-omap1/board-nokia770.c~omap-update-omap1-2-boards-to-give-keymapsize-and-other +++ a/arch/arm/mach-omap1/board-nokia770.c @@ -71,9 +71,11 @@ static struct resource nokia770_kp_resou }; static struct omap_kp_platform_data nokia770_kp_data = { - .rows = 8, - .cols = 8, - .keymap = nokia770_keymap + .rows = 8, + .cols = 8, + .keymap = nokia770_keymap, + .keymapsize = ARRAY_SIZE(nokia770_keymap) + .delay = 4, }; static struct platform_device nokia770_kp_device = { diff -puN arch/arm/mach-omap1/board-osk.c~omap-update-omap1-2-boards-to-give-keymapsize-and-other arch/arm/mach-omap1/board-osk.c --- a/arch/arm/mach-omap1/board-osk.c~omap-update-omap1-2-boards-to-give-keymapsize-and-other +++ a/arch/arm/mach-omap1/board-osk.c @@ -266,9 +266,11 @@ static const int osk_keymap[] = { }; static struct omap_kp_platform_data osk_kp_data = { - .rows = 8, - .cols = 8, - .keymap = (int *) osk_keymap, + .rows = 8, + .cols = 8, + .keymap = (int *) osk_keymap, + .keymapsize = ARRAY_SIZE(osk_keymap), + .delay = 9, }; static struct resource osk5912_kp_resources[] = { diff -puN arch/arm/mach-omap1/board-perseus2.c~omap-update-omap1-2-boards-to-give-keymapsize-and-other arch/arm/mach-omap1/board-perseus2.c --- a/arch/arm/mach-omap1/board-perseus2.c~omap-update-omap1-2-boards-to-give-keymapsize-and-other +++ a/arch/arm/mach-omap1/board-perseus2.c @@ -171,9 +171,12 @@ static struct resource kp_resources[] = }; static struct omap_kp_platform_data kp_data = { - .rows = 8, - .cols = 8, - .keymap = p2_keymap, + .rows = 8, + .cols = 8, + .keymap = p2_keymap, + .keymapsize = ARRAY_SIZE(p2_keymap), + .delay = 4, + .dbounce = 1, }; static struct platform_device kp_device = { diff -puN arch/arm/mach-omap2/board-h4.c~omap-update-omap1-2-boards-to-give-keymapsize-and-other arch/arm/mach-omap2/board-h4.c --- a/arch/arm/mach-omap2/board-h4.c~omap-update-omap1-2-boards-to-give-keymapsize-and-other +++ a/arch/arm/mach-omap2/board-h4.c @@ -245,6 +245,7 @@ static struct omap_kp_platform_data h4_k .rows = 6, .cols = 7, .keymap = h4_keymap, + .keymapsize = ARRAY_SIZE(h4_keymap), .rep = 1, .row_gpios = row_gpios, .col_gpios = col_gpios, _