[Linux-mips-commits]CVS: linux/arch/mips/au1000/pb1100 setup.c,1.1,1.2

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

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

Modified Files:
	setup.c 
Log Message:
* setup gpio
* setup the video options


Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/pb1100/setup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- setup.c	2 Apr 2002 22:59:39 -0000	1.1
+++ setup.c	17 Apr 2002 23:59:09 -0000	1.2
@@ -44,7 +44,7 @@
 #include <asm/reboot.h>
 #include <asm/pgtable.h>
 #include <asm/au1000.h>
-#include <asm/pb1500.h>
+#include <asm/pb1100.h>
 
 #ifdef CONFIG_USB_OHCI
 // Enable the workaround for the OHCI DoneHead
@@ -130,7 +130,7 @@
 
 	// set AUX clock to 12MHz * 8 = 96 MHz
 	writel(8, SYS_AUXPLL);
-	writel(0, SYS_PINSTATERD);
+	writel(0, SYS_PININPUTEN);
 	udelay(100);
 
 #if defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1000_USB_DEVICE)
@@ -144,6 +144,8 @@
 		strcat(argptr, usb_args);
 	}
 #endif
+	// configure pins GPIO[14:9] as GPIO
+	pin_func = readl(SYS_PINFUNC) & (u32)(~0x80);
 
 	/* zero and disable FREQ2 */
 	sys_freqctrl = readl(SYS_FREQCTRL0);
@@ -196,18 +198,27 @@
 	conswitchp = &dummy_con;
 #endif
 
+#ifdef CONFIG_FB_AU1100
+	if ((argptr = strstr(argptr, "video=")) == NULL) {
+		argptr = prom_getcmdline();
+		/* default panel */
+		strcat(argptr, " video=au1100fb:panel:Sharp_320x240_16");
+	}
+#endif
+
 #ifdef CONFIG_FB_E1356
 	if ((argptr = strstr(argptr, "video=")) == NULL) {
 		argptr = prom_getcmdline();
 		strcat(argptr, " video=e1356fb:system:pb1500");
 	}
-#endif // CONFIG_FB_E1356
+#endif
 
 #ifndef CONFIG_SERIAL_NONSTANDARD
 	/* don't touch the default serial console */
 	writel(0, UART0_ADDR + UART_CLK);
 #endif
-	writel(0, UART3_ADDR + UART_CLK);
+	outl(0, UART1_ADDR + UART_CLK);
+	outl(0, UART3_ADDR + UART_CLK);
 
 #ifdef CONFIG_BLK_DEV_IDE
 	ide_ops = &std_ide_ops;