From: arun c <arunedarath@mistralsolutions.com>
Date: Tue, 12 Aug 2008 08:58:49 +0000 (+0530)
Subject: OMAP2EVM: Add keypad support
X-Git-Tag: v2.6.27-omap1~314
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=66cf8f46fd5646dae9d2facff84eb516f39f2c35;p=linux-2.6-omap-h63xx.git

OMAP2EVM: Add keypad support

TWL4030 keypad controller driver support for OMAP2EVM

Signed-off-by: Arun C <arunedarath@mistralsolutions.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/board-omap2evm.c b/arch/arm/mach-omap2/board-omap2evm.c
index b6354e368bd..9eb93b6802c 100644
--- a/arch/arm/mach-omap2/board-omap2evm.c
+++ b/arch/arm/mach-omap2/board-omap2evm.c
@@ -17,6 +17,7 @@
 #include <linux/err.h>
 #include <linux/clk.h>
 #include <linux/io.h>
+#include <linux/input.h>
 
 #include <asm/hardware.h>
 #include <asm/mach-types.h>
@@ -27,6 +28,7 @@
 #include <asm/arch/board.h>
 #include <asm/arch/common.h>
 #include <asm/arch/hsmmc.h>
+#include <asm/arch/keypad.h>
 
 static struct resource omap2evm_smc911x_resources[] = {
 	[0] =   {
@@ -72,6 +74,41 @@ static struct omap_lcd_config omap2_evm_lcd_config __initdata = {
 	.ctrl_name	= "internal",
 };
 
+static int omap2evm_keymap[] = {
+	KEY(0, 0, KEY_LEFT),
+	KEY(0, 1, KEY_RIGHT),
+	KEY(0, 2, KEY_A),
+	KEY(0, 3, KEY_B),
+	KEY(1, 0, KEY_DOWN),
+	KEY(1, 1, KEY_UP),
+	KEY(1, 2, KEY_E),
+	KEY(1, 3, KEY_F),
+	KEY(2, 0, KEY_ENTER),
+	KEY(2, 1, KEY_I),
+	KEY(2, 2, KEY_J),
+	KEY(2, 3, KEY_K),
+	KEY(3, 0, KEY_M),
+	KEY(3, 1, KEY_N),
+	KEY(3, 2, KEY_O),
+	KEY(3, 3, KEY_P)
+};
+
+static struct omap_kp_platform_data omap2evm_kp_data = {
+	.rows		= 4,
+	.cols		= 4,
+	.keymap 	= omap2evm_keymap,
+	.keymapsize	= ARRAY_SIZE(omap2evm_keymap),
+	.rep		= 1,
+};
+
+static struct platform_device omap2evm_kp_device = {
+	.name		= "omap_twl4030keypad",
+	.id		= -1,
+	.dev		= {
+				.platform_data = &omap2evm_kp_data,
+			},
+};
+
 static void __init omap2_evm_init_irq(void)
 {
 	omap2_init_common_hw(NULL);
@@ -111,6 +148,7 @@ static int __init omap2_evm_i2c_init(void)
 static struct platform_device *omap2_evm_devices[] __initdata = {
 	&omap2_evm_lcd_device,
 	&omap2evm_smc911x_device,
+	&omap2evm_kp_device,
 };
 
 static void __init omap2_evm_init(void)