Commit 4d24607b authored by Komal Shah's avatar Komal Shah Committed by Linus Torvalds

[PATCH] OMAP: Update OMAP1/2 boards to give keymapsize and other pdata

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: default avatarKomal Shah <komal_shah802003@yahoo.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ad4e09b1
...@@ -172,9 +172,11 @@ static struct resource kp_resources[] = { ...@@ -172,9 +172,11 @@ static struct resource kp_resources[] = {
}; };
static struct omap_kp_platform_data kp_data = { static struct omap_kp_platform_data kp_data = {
.rows = 8, .rows = 8,
.cols = 8, .cols = 8,
.keymap = fsample_keymap, .keymap = fsample_keymap,
.keymapsize = ARRAY_SIZE(fsample_keymap),
.delay = 4,
}; };
static struct platform_device kp_device = { static struct platform_device kp_device = {
......
...@@ -167,10 +167,13 @@ static struct resource h2_kp_resources[] = { ...@@ -167,10 +167,13 @@ static struct resource h2_kp_resources[] = {
}; };
static struct omap_kp_platform_data h2_kp_data = { static struct omap_kp_platform_data h2_kp_data = {
.rows = 8, .rows = 8,
.cols = 8, .cols = 8,
.keymap = h2_keymap, .keymap = h2_keymap,
.rep = 1, .keymapsize = ARRAY_SIZE(h2_keymap),
.rep = 1,
.delay = 9,
.dbounce = 1,
}; };
static struct platform_device h2_kp_device = { static struct platform_device h2_kp_device = {
......
...@@ -247,10 +247,13 @@ static struct resource h3_kp_resources[] = { ...@@ -247,10 +247,13 @@ static struct resource h3_kp_resources[] = {
}; };
static struct omap_kp_platform_data h3_kp_data = { static struct omap_kp_platform_data h3_kp_data = {
.rows = 8, .rows = 8,
.cols = 8, .cols = 8,
.keymap = h3_keymap, .keymap = h3_keymap,
.rep = 1, .keymapsize = ARRAY_SIZE(h3_keymap),
.rep = 1,
.delay = 9,
.dbounce = 1,
}; };
static struct platform_device h3_kp_device = { static struct platform_device h3_kp_device = {
......
...@@ -159,9 +159,11 @@ static struct resource innovator_kp_resources[] = { ...@@ -159,9 +159,11 @@ static struct resource innovator_kp_resources[] = {
}; };
static struct omap_kp_platform_data innovator_kp_data = { static struct omap_kp_platform_data innovator_kp_data = {
.rows = 8, .rows = 8,
.cols = 8, .cols = 8,
.keymap = innovator_keymap, .keymap = innovator_keymap,
.keymapsize = ARRAY_SIZE(innovator_keymap),
.delay = 4,
}; };
static struct platform_device innovator_kp_device = { static struct platform_device innovator_kp_device = {
......
...@@ -71,9 +71,11 @@ static struct resource nokia770_kp_resources[] = { ...@@ -71,9 +71,11 @@ static struct resource nokia770_kp_resources[] = {
}; };
static struct omap_kp_platform_data nokia770_kp_data = { static struct omap_kp_platform_data nokia770_kp_data = {
.rows = 8, .rows = 8,
.cols = 8, .cols = 8,
.keymap = nokia770_keymap .keymap = nokia770_keymap,
.keymapsize = ARRAY_SIZE(nokia770_keymap)
.delay = 4,
}; };
static struct platform_device nokia770_kp_device = { static struct platform_device nokia770_kp_device = {
......
...@@ -266,9 +266,11 @@ static const int osk_keymap[] = { ...@@ -266,9 +266,11 @@ static const int osk_keymap[] = {
}; };
static struct omap_kp_platform_data osk_kp_data = { static struct omap_kp_platform_data osk_kp_data = {
.rows = 8, .rows = 8,
.cols = 8, .cols = 8,
.keymap = (int *) osk_keymap, .keymap = (int *) osk_keymap,
.keymapsize = ARRAY_SIZE(osk_keymap),
.delay = 9,
}; };
static struct resource osk5912_kp_resources[] = { static struct resource osk5912_kp_resources[] = {
......
...@@ -171,9 +171,12 @@ static struct resource kp_resources[] = { ...@@ -171,9 +171,12 @@ static struct resource kp_resources[] = {
}; };
static struct omap_kp_platform_data kp_data = { static struct omap_kp_platform_data kp_data = {
.rows = 8, .rows = 8,
.cols = 8, .cols = 8,
.keymap = p2_keymap, .keymap = p2_keymap,
.keymapsize = ARRAY_SIZE(p2_keymap),
.delay = 4,
.dbounce = 1,
}; };
static struct platform_device kp_device = { static struct platform_device kp_device = {
......
...@@ -245,6 +245,7 @@ static struct omap_kp_platform_data h4_kp_data = { ...@@ -245,6 +245,7 @@ static struct omap_kp_platform_data h4_kp_data = {
.rows = 6, .rows = 6,
.cols = 7, .cols = 7,
.keymap = h4_keymap, .keymap = h4_keymap,
.keymapsize = ARRAY_SIZE(h4_keymap),
.rep = 1, .rep = 1,
.row_gpios = row_gpios, .row_gpios = row_gpios,
.col_gpios = col_gpios, .col_gpios = col_gpios,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment