[Hackndev-commit] SF.net SVN: hackndev: [610] linux4palm/linux/trunk/arch/arm/mach-pxa/palmld

[<bob...@us...>]

Revision: 610
          http://svn.sourceforge.net/hackndev/?rev=610&view=rev
Author:   bobofdoom
Date:     2006-10-01 02:21:02 -0700 (Sun, 01 Oct 2006)

Log Message:
-----------
palmld: now using the same PXA27x keyboard driver as the HTC group.

Modified Paths:
--------------
    linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/Kconfig
    linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/Kconfig
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/Kconfig	2006-10-01 09:06:36 UTC (rev 609)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/Kconfig	2006-10-01 09:21:02 UTC (rev 610)
@@ -1,6 +1,7 @@
 menuconfig MACH_XSCALE_PALMLD
 	bool "Palm LifeDrive"
 	select PXA27x
+	select KEYBOARD_PXA27x
 	help
 		Say Y here if you intend to run this kernel on a Palm 
 		LifeDrive. Currently there is only basic support for 

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c	2006-10-01 09:06:36 UTC (rev 609)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld.c	2006-10-01 09:21:02 UTC (rev 610)
@@ -214,55 +214,75 @@
 	},
 };
 
-/**
+/*********************************************************
  * Keypad
- */
-static int palmld_keypad_matrix[] = {
-		/* row 0 */
-		-1,		/* unused */
-		KEY_F10,	/* Folder */
-		KEY_UP,		/* Nav up */
-		/* row 1 */
-		KEY_F11,	/* Picture */
-		KEY_F12,	/* Star */
-		KEY_RIGHT,	/* Nav right */
-		/* row 2 */
-		KEY_F9,		/* Home */
-		KEY_F13,	/* Voice memo */
-		KEY_DOWN,	/* Nav down */
-		/* row 3 */
-		KEY_F14,	/* Rotate display */
-		KEY_ENTER,	/* Nav centre */
-		KEY_LEFT,	/* Nav left */
-	};
+ *********************************************************/
 
-static struct pxa27x_keypad_platform_data palmld_keypad_data = {
-	.matrix		= palmld_keypad_matrix,	
-	.rows 		= 4,
-	.cols		= 3,
+static struct pxa27x_keyboard_platform_data palmld_kbd_data = {
+	.nr_rows = 4,
+	.nr_cols = 3,
+	.keycodes = {
+		{	/* row 0 */
+			-1,		/* unused */
+			KEY_F10,	/* Folder */
+			KEY_UP,		/* Nav up */
+		},
+		{	/* row 1 */
+			KEY_F11,	/* Picture */
+			KEY_F12,	/* Star */
+			KEY_RIGHT,	/* Nav right */
+		},
+		{	/* row 2 */
+			KEY_F9,		/* Home */
+			KEY_F7,		/* Voice memo */
+			KEY_DOWN,	/* Nav down */
+		},
+		{
+			/* row 3 */
+			KEY_F8,		/* Rotate display */
+			KEY_ENTER,	/* Nav centre */
+			KEY_LEFT,	/* Nav left */
+		},
+
+	},
+	.gpio_modes = {
+		 GPIO_NR_PALMLD_KP_MKIN0_MD,
+		 GPIO_NR_PALMLD_KP_MKIN1_MD,
+		 GPIO_NR_PALMLD_KP_MKIN2_MD,
+		 GPIO_NR_PALMLD_KP_MKIN3_MD,
+		 GPIO_NR_PALMLD_KP_MKOUT0_MD,
+		 GPIO_NR_PALMLD_KP_MKOUT1_MD,
+		 GPIO_NR_PALMLD_KP_MKOUT2_MD,
+	 },
 };
 
-struct platform_device palmld_keypad = {
-	.name	= "pxa27x-keypad",
-	.id 	= -1,
-	.dev = {
-			.platform_data = &palmld_keypad_data
+static struct platform_device palmld_kbd = {
+        .name   = "pxa27x-keyboard",
+        .id     = -1,
+	.dev	=  {
+		.platform_data	= &palmld_kbd_data,
 	},
 };
 
-/**
+
+/*********************************************************
  * IDE
- */
+ *********************************************************/
 
+
 struct platform_device palmld_ide = {
 	.name = "palmld-ide",
 	.id = 0,
 };
 
 static struct platform_device *devices[] __initdata = {
-	&palmld_keypad, &palmld_ac97, &palmld_ide, &palmld_backlight,
+	&palmld_kbd, &palmld_ac97, &palmld_ide, &palmld_backlight,
 };
 
+/*********************************************************
+ * LCD
+ *********************************************************/
+
 static struct pxafb_mach_info palmld_lcd __initdata = {
 	/* pixclock is set by lccr3 below */
 	.pixclock		= 0,		


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.