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

[Steve L. <slo...@us...>]

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

Modified Files:
	setup.c 
Log Message:
Moved sed1356 display-type selection from setup.c to fb driver.


Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/au1000/pb1000/setup.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** setup.c	2001/08/28 07:23:54	1.6
--- setup.c	2001/08/30 21:55:28	1.7
***************
*** 130,138 ****
  #endif
  
- #ifdef CONFIG_USB_OHCI
- 
  	outl(usb_clocks, CLOCK_SOURCE_CNTRL);
  	udelay(1000);
  
  	// enable host controller and wait for reset done
  	outl(0x08, USB_HOST_CONFIG);
--- 130,137 ----
  #endif
  
  	outl(usb_clocks, CLOCK_SOURCE_CNTRL);
  	udelay(1000);
  
+ #ifdef CONFIG_USB_OHCI
  	// enable host controller and wait for reset done
  	outl(0x08, USB_HOST_CONFIG);
***************
*** 156,160 ****
  	outl(0x2800, TSTATE_STATE_SET);
  	outl(0x0030, OUTPUT_STATE_CLEAR);
! #endif
  
  	/* make gpio 15 an input (interrupt line) */
--- 155,159 ----
  	outl(0x2800, TSTATE_STATE_SET);
  	outl(0x0030, OUTPUT_STATE_CLEAR);
! #endif // defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1000_USB_DEVICE)
  
  	/* make gpio 15 an input (interrupt line) */
***************
*** 167,183 ****
  
  #ifdef CONFIG_FB_E1356
- 	if ((argptr = strstr(argptr, "video=")) == NULL) {
- 	    argptr = prom_getcmdline();
- #ifdef CONFIG_PB1000_CRT
- 	    strcat(argptr, " video=e1356fb:system:pb1000-crt,font:SUN8x16");
- #elif defined (CONFIG_PB1000_NTSC)
- 	    strcat(argptr, " video=e1356fb:system:pb1000-ntsc,font:SUN8x16");
- #elif defined (CONFIG_PB1000_TFT)
- 	    strcat(argptr, " video=e1356fb:system:pb1000-tft,font:SUN8x16");
- #else
- 	    strcat(argptr, " video=e1356fb:system:pb1000-crt,font:SUN8x16");
- #endif
- 	}
-  
  	static_cfg0 = inl(STATIC_CONFIG_0) & (u32)(~0x1c00);
  	outl(static_cfg0, STATIC_CONFIG_0);
--- 166,169 ----
***************
*** 191,195 ****
  	// Set 32-bit base address decoding for RCE2*
  	outl(0x10003ff0, STATIC_ADDRESS_2);
! #endif
  
  #ifdef CONFIG_PCI
--- 177,187 ----
  	// Set 32-bit base address decoding for RCE2*
  	outl(0x10003ff0, STATIC_ADDRESS_2);
! 
! 	if ((argptr = strstr(argptr, "video=")) == NULL) {
! 		argptr = prom_getcmdline();
! 		strcat(argptr, " video=e1356fb:system:pb1000");
! 	}
! #endif // CONFIG_FB_E1356
! 
  
  #ifdef CONFIG_PCI