[Linux-mips-commits]CVS: linux/drivers/char au1000_gpio.c,1.6,1.7

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv7382/drivers/char

Modified Files:
	au1000_gpio.c 
Log Message:

* removed runtime copyright prints
* Added Pb1500 support (only pcmcia not working at this time) and
  modified all drivers as necessary
* renamed most Au1000 registers to match latest databook
* better Au1000 usb hardware fixes for early silicon
* updated mtd driver to support Pb1500 partitioning



Index: au1000_gpio.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/au1000_gpio.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- au1000_gpio.c	20 Nov 2001 01:52:22 -0000	1.6
+++ au1000_gpio.c	15 Feb 2002 19:47:27 -0000	1.7
@@ -68,7 +68,7 @@
 u32 get_au1000_avail_gpio_mask(void)
 {
 	int i;
-	u32 pinfunc = inl(PIN_FUNCTION);
+	u32 pinfunc = inl(SYS_PINFUNC);
 	u32 avail_mask = 0; // start with no gpio available
 
 	// first, check for GPIO's reprogrammed as peripheral pins
@@ -81,8 +81,8 @@
 	}
 
 	// check for GPIO's used as interrupt sources
-	avail_mask &= ~(inl(INTC1_MASK_READ) &
-			(inl(INTC1_CONFIG0_READ) | inl(INTC1_CONFIG1_READ)));
+	avail_mask &= ~(inl(IC1_MASKRD) &
+			(inl(IC1_CFG0RD) | inl(IC1_CFG1RD)));
 
 #ifdef CONFIG_USB_OHCI
 	avail_mask &= ~((1<<4) | (1<<11));
@@ -104,7 +104,7 @@
 	data &= get_au1000_avail_gpio_mask();
 
 	if (data)
-		outl(data, TSTATE_STATE_SET);
+		outl(data, SYS_TRIOUTCLR);
 
 	return 0;
 }
@@ -117,7 +117,7 @@
  */
 int au1000gpio_in(u32 *data)
 {
-	*data = inl(PIN_STATE);
+	*data = inl(SYS_PINSTATERD);
 	return 0;
 }
 
@@ -130,7 +130,7 @@
 	data &= get_au1000_avail_gpio_mask();
 
 	if (data)
-		outl(data, OUTPUT_STATE_SET);
+		outl(data, SYS_OUTPUTSET);
 	return 0;
 }
 
@@ -139,7 +139,7 @@
 	data &= get_au1000_avail_gpio_mask();
 
 	if (data)
-		outl(data, OUTPUT_STATE_CLEAR);
+		outl(data, SYS_OUTPUTCLR);
 	return 0;
 }