[Hackndev-commit] SF.net SVN: hackndev: [909] linux4palm/linux/trunk/arch/arm/mach-pxa/ palmz72/palmz72.c

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

Revision: 909
          http://svn.sourceforge.net/hackndev/?rev=909&view=rev
Author:   z72ka
Date:     2007-03-13 11:09:24 -0700 (Tue, 13 Mar 2007)

Log Message:
-----------
Palmz72: make buildable with latest HH sync (commented irda... woks now too)
fixed gpiokeys - at this time only for experimenting

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

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72.c	2007-03-12 22:08:05 UTC (rev 908)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72.c	2007-03-13 18:09:24 UTC (rev 909)
@@ -32,10 +32,8 @@
 #include <asm/arch/pxapwm-bl.h>
 #include <asm/arch/irda.h>
 #include <asm/arch/serial.h>
-#include <asm/hardware/gpio_keys.h>
+#include <linux/gpio_keys.h>
 
-
-
 #include <asm/arch/udc.h>
 #include <asm/arch/irda.h>
 #include <asm/arch/mmc.h>
@@ -145,7 +143,7 @@
 	.nr_cols = 3,
 	.keycodes = {
 		{	/* row 0 */
-			KEY_POWER,		/* Power key 	*/
+			KEY_F8,			/* Power key 	*/
 			KEY_F11,		/* Photos  	*/
 			KEY_ENTER,		/* DPAD Center	*/
 		},
@@ -155,15 +153,15 @@
 			KEY_F12,		/* Media 	*/
 		},
 		{	/* row 2 */
-			KEY_UP,			/* D-PAD UP	*/
+			KEY_LEFT,			/* D-PAD UP	*/
 			0,			/* unused 	*/
-			KEY_DOWN,		/* D-PAD DOWN 	*/
+			KEY_RIGHT,		/* D-PAD DOWN 	*/
 		},
 		{
 			/* row 3 */
-			KEY_RIGHT,		/* D-PAD RIGHT 	*/
+			KEY_UP,		/* D-PAD RIGHT 	*/
 			0,			/* unused 	*/
-			KEY_LEFT,		/* D-PAD LEFT 	*/
+			KEY_DOWN,		/* D-PAD LEFT 	*/
 		},
 	},
 	.gpio_modes = {
@@ -189,9 +187,9 @@
 /********************************
  * GPIO Key - Voice Memo Button *
  ********************************/
-
+#ifdef CONFIG_GPIO_KEYS
 static struct gpio_keys_button palmz72_pxa_buttons[] = {
-	{KEY_F7, GPIO_NR_PALMZ72_KP_DKIN7, 1, "Voice Memo Button" },
+	{KEY_F7, GPIO_NR_PALMZ72_KP_DKIN7, 0, "Voice Memo Button" },
 };
 
 static struct gpio_keys_platform_data palmz72_pxa_keys_data = {
@@ -205,23 +203,23 @@
 		.platform_data = &palmz72_pxa_keys_data,
 	},
 };
+#endif
 
-
 /********
  * IRDA *
  ********/
-
+/*
 static void
 palmz72_irda_configure (struct uart_pxa_port *up, int enable)
 {
-	/* Switch STUART RX/TX pins to SIR */
+	// Switch STUART RX/TX pins to SIR 
 	pxa_gpio_mode( GPIO_NR_PALMZ72_STD_RXD_MD );
 	pxa_gpio_mode( GPIO_NR_PALMZ72_STD_TXD_MD );
-	/* make sure FIR ICP is off */
+	// make sure FIR ICP is off
 	ICCR0 = 0;
 
 	if (enable) {
-		/* configure STUART to for SIR */
+		// configure STUART to for SIR
 		STISR = STISR_XMODE | STISR_RCVEIR | STISR_RXPL;
 		GPSR(91) = GPIO_bit(91);
 	} else {
@@ -236,7 +234,7 @@
 	unsigned new_stisr = old_stisr;
 
 	if (txrx & PXA_SERIAL_TX) {
-		/* Ignore RX if TX is set */
+		// Ignore RX if TX is set
 		txrx &= PXA_SERIAL_TX;
 		new_stisr |= STISR_XMITIR;
 	} else
@@ -267,7 +265,7 @@
 	.set_txrx  = palmz72_irda_set_txrx,
 	.get_txrx  = palmz72_irda_get_txrx,
 };
-
+*/
 /*************************
  * AC97 audio controller *
  *************************/
@@ -343,7 +341,6 @@
 	.vsync_len		= 1,
 	.upper_margin		= 7,  // This value is optimized for older problematic LCD panels
 	.lower_margin		= 8,  // This value is optimized for older problematic LCD panels
-//	.sync			= FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT,
     }
 };
 
@@ -376,7 +373,10 @@
 	&palmz72_pm,
 	&palmz72_backlight,
 	&palmz72_keypad,
+	//&palmz72_pxa_irda_funcs
+#ifdef CONFIG_GPIO_KEYS
 	&palmz72_pxa_keys,
+#endif
 	&palmz72_led_device, 
 };
 
@@ -409,7 +409,7 @@
 	set_pxa_fb_info( &palmz72_lcd_screen );
 	pxa_set_mci_info( &palmz72_mci_platform_data );
 	pxa_set_udc_info(&palmz72_udc_mach_info );
-        stuart_device.dev.platform_data = &palmz72_pxa_irda_funcs;
+        //stuart_device.dev.platform_data = &palmz72_pxa_irda_funcs;
         platform_add_devices( devices, ARRAY_SIZE(devices) );
 }
 


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