[Hackndev-commit] SF.net SVN: hackndev: [891] linux4palm/linux/trunk/arch/arm

[<z7...@us...>]

Revision: 891
          http://svn.sourceforge.net/hackndev/?rev=891&view=rev
Author:   z72ka
Date:     2007-03-01 00:30:28 -0800 (Thu, 01 Mar 2007)

Log Message:
-----------
Palmz72: Added support for Voice Memo button via gpio-keys
Palmz72: small change with key-mapping pxa-keypad
Palmz72: gpio-keys added to defconfig

Modified Paths:
--------------
    linux4palm/linux/trunk/arch/arm/configs/palmz72_defconfig
    linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72.c

Modified: linux4palm/linux/trunk/arch/arm/configs/palmz72_defconfig
===================================================================
--- linux4palm/linux/trunk/arch/arm/configs/palmz72_defconfig	2007-02-28 11:35:22 UTC (rev 890)
+++ linux4palm/linux/trunk/arch/arm/configs/palmz72_defconfig	2007-03-01 08:30:28 UTC (rev 891)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.20-hnd0
-# Thu Feb 22 15:30:54 2007
+# Thu Mar  1 09:20:29 2007
 #
 CONFIG_ARM=y
 # CONFIG_GENERIC_TIME is not set
@@ -164,8 +164,6 @@
 # CONFIG_ARCH_ROVERP1 is not set
 # CONFIG_ARCH_ROVERP5P is not set
 # CONFIG_MACH_XSCALE_PALMLD is not set
-# CONFIG_GPIOED is not set
-# CONFIG_GPIOEDNG is not set
 # CONFIG_MACH_XSCALE_PALMTREO650 is not set
 # CONFIG_MACH_XSCALE_TREO680 is not set
 # CONFIG_MACH_T700WX is not set
@@ -176,6 +174,8 @@
 CONFIG_MACH_PALMZ72=y
 CONFIG_PALMZ72_PM=y
 CONFIG_PALMZ72_BATTERY=m
+# CONFIG_GPIOED is not set
+# CONFIG_GPIOEDNG is not set
 # CONFIG_MACH_OMAP_PALMTC is not set
 # CONFIG_MACH_ZIRE31 is not set
 # CONFIG_PXA_SHARPSL is not set
@@ -605,7 +605,7 @@
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_GPIO_KEYS is not set
+CONFIG_GPIO_KEYS=y
 CONFIG_KEYBOARD_PXA27x=y
 # CONFIG_KEYBOARD_PALMIR is not set
 CONFIG_KEYBOARD_PALMWK=m
@@ -773,6 +773,7 @@
 #
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_MMC_CARD=y
 # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
 # CONFIG_LEDS_TRIGGER_SHARED is not set
 
@@ -962,7 +963,6 @@
 # CONFIG_MMC_TIFM_SD is not set
 # CONFIG_MMC_TMIO is not set
 # CONFIG_MMC_SAMCOP is not set
-# CONFIG_MMC_WBSD_PALMT3 is not set
 
 #
 # Real Time Clock

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72.c	2007-02-28 11:35:22 UTC (rev 890)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72.c	2007-03-01 08:30:28 UTC (rev 891)
@@ -32,6 +32,7 @@
 #include <asm/arch/pxapwm-bl.h>
 #include <asm/arch/irda.h>
 #include <asm/arch/serial.h>
+#include <asm/hardware/gpio_keys.h>
 
 
 
@@ -145,7 +146,7 @@
 	.keycodes = {
 		{	/* row 0 */
 			KEY_POWER,		/* Power key 	*/
-			KEY_F13,		/* Photos  	*/
+			KEY_F11,		/* Photos  	*/
 			KEY_ENTER,		/* DPAD Center	*/
 		},
 		{	/* row 1 */
@@ -185,7 +186,27 @@
 	},
 };
 
+/********************************
+ * GPIO Key - Voice Memo Button *
+ ********************************/
 
+static struct gpio_keys_button palmz72_pxa_buttons[] = {
+	{KEY_F7, GPIO_NR_PALMZ72_KP_DKIN7, 1, "Voice Memo Button" },
+};
+
+static struct gpio_keys_platform_data palmz72_pxa_keys_data = {
+	.buttons = palmz72_pxa_buttons,
+	.nbuttons = ARRAY_SIZE(palmz72_pxa_buttons),
+};
+
+static struct platform_device palmz72_pxa_keys = {
+	.name = "gpio-keys",
+	.dev = {
+		.platform_data = &palmz72_pxa_keys_data,
+	},
+};
+
+
 /********
  * IRDA *
  ********/
@@ -355,6 +376,7 @@
 	&palmz72_pm,
 	&palmz72_backlight,
 	&palmz72_keypad,
+	&palmz72_pxa_keys,
 	&palmz72_led_device, 
 };
 


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