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

[<mar...@us...>]

Revision: 1270
          http://hackndev.svn.sourceforge.net/hackndev/?rev=1270&view=rev
Author:   marex_z71
Date:     2007-08-25 12:39:34 -0700 (Sat, 25 Aug 2007)

Log Message:
-----------
PalmTX: corrected PCMCIA driver, all control lines should be correctly set up now

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

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_pcmcia.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_pcmcia.c	2007-08-25 03:09:05 UTC (rev 1269)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_pcmcia.c	2007-08-25 19:39:34 UTC (rev 1270)
@@ -55,21 +55,16 @@
 
 static int palmtx_pcmcia_hw_init (struct soc_pcmcia_socket *skt)
 {
-        GPSR(GPIO48_nPOE) = GPIO_bit(GPIO48_nPOE) |
-			    GPIO_bit(GPIO49_nPWE) |
-    			    GPIO_bit(GPIO85_nPCE_1_MD) |
-			    GPIO_bit(GPIO53_nPCE_2_MD) |
-			    GPIO_bit(GPIO54_pSKTSEL_MD) |
-    			    GPIO_bit(GPIO55_nPREG_MD) |
-			    GPIO_bit(GPIO56_nPWAIT_MD);
-
         pxa_gpio_mode(GPIO48_nPOE_MD);
         pxa_gpio_mode(GPIO49_nPWE_MD);
+        pxa_gpio_mode(GPIO50_nPIOR_MD);
+        pxa_gpio_mode(GPIO51_nPIOW_MD);
         pxa_gpio_mode(GPIO85_nPCE_1_MD);
         pxa_gpio_mode(GPIO53_nPCE_2_MD);
         pxa_gpio_mode(GPIO54_pSKTSEL_MD);
         pxa_gpio_mode(GPIO55_nPREG_MD);
         pxa_gpio_mode(GPIO56_nPWAIT_MD);
+        pxa_gpio_mode(GPIO57_nIOIS16_MD);
 
 	skt->irq = IRQ_GPIO(GPIO_NR_PALMTX_PCMCIA_READY);
 


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