8 files changed, 41 insertions, 23 deletions

diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c
index c753a3c5aadd..62e42c7a628e 100644
--- a/arch/arm/mach-omap1/board-fsample.c
+++ b/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 --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index cd3a06dfc0a8..6e113078f7ab 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/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 --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index 7b206116cd03..f225a083dee1 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/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 --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c
index 4cbc62db5b5d..cb00530ad279 100644
--- a/arch/arm/mach-omap1/board-innovator.c
+++ b/arch/arm/mach-omap1/board-innovator.c
@@ -159,9 +159,11 @@ static struct resource innovator_kp_resources[] = {
 };
 
 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 --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index 02b980d77b12..dbc555d209ff 100644
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -71,9 +71,11 @@ static struct resource nokia770_kp_resources[] = {
 };
 
 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 --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index b742261c97ad..6b05647a6c01 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/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 --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
index 64b45d8ae357..fa4be962df67 100644
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/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 --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
index 4933fce766c8..996aeda1285d 100644
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@ -245,6 +245,7 @@ static struct omap_kp_platform_data h4_kp_data = {
         .rows           = 6,
         .cols           = 7,
         .keymap         = h4_keymap,
+        .keymapsize     = ARRAY_SIZE(h4_keymap),
         .rep            = 1,
         .row_gpios      = row_gpios,
         .col_gpios      = col_gpios,