[Linux-mips-commits]CVS: linux/arch/mips/au1000/pb1000 setup.c,1.10,1.11

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

Update of /cvsroot/linux-mips/linux/arch/mips/au1000/pb1000
In directory usw-pr-cvs1:/tmp/cvs-serv23851/arch/mips/au1000/pb1000

Modified Files:
	setup.c 
Log Message:
Epson 1356 fb driver update from MontaVista's source tree.


Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/pb1000/setup.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- setup.c	2001/10/03 23:04:23	1.10
+++ setup.c	2001/10/10 19:21:06	1.11
@@ -160,9 +160,12 @@
 	outl(0x0030, OUTPUT_STATE_CLEAR);
 #endif // defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1000_USB_DEVICE)
 
-	/* make gpio 15 an input (interrupt line) */
+	/* select gpio 15 (for interrupt line) */
 	pin_func = inl(PIN_FUNCTION) & (u32)(~0x100);
+	/* we don't need I2S, so make it available for GPIO[31:29] */
+	pin_func |= (1<<5);
 	outl(pin_func, PIN_FUNCTION);
+
 	outl(0x8000, TSTATE_STATE_SET);
 	
 #ifdef CONFIG_FB