[Gc-linux-cvs] linux/drivers/serial Kconfig, 1.6, 1.7 Makefile, 1.5, 1.6

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/serial
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6933/drivers/serial

Modified Files:
	Kconfig Makefile 
Log Message:
Merge v2.6.29-rc6.

NOTE: Some of the Kconfig options and Makefile entries for the drivers
marked as "broken" will disappear with this commit.



Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/serial/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile	1 Feb 2009 18:29:35 -0000	1.5
--- Makefile	2 Mar 2009 19:26:37 -0000	1.6
***************
*** 42,45 ****
--- 42,47 ----
  obj-$(CONFIG_SERIAL_S3C2412) += s3c2412.o
  obj-$(CONFIG_SERIAL_S3C2440) += s3c2440.o
+ obj-$(CONFIG_SERIAL_S3C24A0) += s3c24a0.o
+ obj-$(CONFIG_SERIAL_S3C6400) += s3c6400.o
  obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o
  obj-$(CONFIG_SERIAL_MUX) += mux.o
***************
*** 71,74 ****
--- 73,77 ----
  obj-$(CONFIG_SERIAL_NETX) += netx-serial.o
  obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o
+ obj-$(CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL) += nwpserial.o
  obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
  obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/serial/Kconfig,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Kconfig	1 Feb 2009 18:29:35 -0000	1.6
--- Kconfig	2 Mar 2009 19:26:37 -0000	1.7
***************
*** 448,452 ****
  config SERIAL_SAMSUNG
  	tristate "Samsung SoC serial support"
! 	depends on ARM && PLAT_S3C24XX
  	select SERIAL_CORE
  	help
--- 448,452 ----
  config SERIAL_SAMSUNG
  	tristate "Samsung SoC serial support"
! 	depends on ARM && PLAT_S3C
  	select SERIAL_CORE
  	help
***************
*** 456,459 ****
--- 456,469 ----
  	  pins are configured.
  
+ config SERIAL_SAMSUNG_UARTS
+ 	int
+ 	depends on ARM && PLAT_S3C
+ 	default 2 if ARCH_S3C2400
+ 	default 4 if ARCH_S3C64XX || CPU_S3C2443
+ 	default 3
+ 	help
+ 	  Select the number of available UART ports for the Samsung S3C
+ 	  serial driver
+ 	
  config SERIAL_SAMSUNG_DEBUG
  	bool "Samsung SoC serial debug"
***************
*** 509,513 ****
--- 519,536 ----
  	  Serial port support for the Samsung S3C2440 and S3C2442 SoC
  
+ config SERIAL_S3C24A0
+ 	tristate "Samsung S3C24A0 Serial port support"
+ 	depends on SERIAL_SAMSUNG && CPU_S3C24A0
+ 	default y if CPU_S3C24A0
+ 	help
+ 	  Serial port support for the Samsung S3C24A0 SoC
  
+ config SERIAL_S3C6400
+ 	tristate "Samsung S3C6400/S3C6410 Serial port support"
+ 	depends on SERIAL_SAMSUNG && (CPU_S3C600 || CPU_S3C6410)
+ 	default y
+ 	help
+ 	  Serial port support for the Samsung S3C6400 and S3C6410
+ 	  SoCs
  
  config SERIAL_DZ
***************
*** 960,964 ****
  config SERIAL_PNX8XXX
  	bool "Enable PNX8XXX SoCs' UART Support"
! 	depends on MIPS && SOC_PNX8550
  	select SERIAL_CORE
  	help
--- 983,987 ----
  config SERIAL_PNX8XXX
  	bool "Enable PNX8XXX SoCs' UART Support"
! 	depends on MIPS && (SOC_PNX8550 || SOC_PNX833X)
  	select SERIAL_CORE
  	help
***************
*** 1298,1302 ****
  	tristate "Serial port on Open Firmware platform bus"
  	depends on PPC_OF
! 	depends on SERIAL_8250
  	help
  	  If you have a PowerPC based system that has serial ports
--- 1321,1325 ----
  	tristate "Serial port on Open Firmware platform bus"
  	depends on PPC_OF
! 	depends on SERIAL_8250 || SERIAL_OF_PLATFORM_NWPSERIAL
  	help
  	  If you have a PowerPC based system that has serial ports
***************
*** 1305,1308 ****
--- 1328,1348 ----
  	  others can easily be added.
  
+ config SERIAL_OF_PLATFORM_NWPSERIAL
+ 	tristate "NWP serial port driver"
+ 	depends on PPC_OF && PPC_DCR
+ 	select SERIAL_OF_PLATFORM
+ 	select SERIAL_CORE_CONSOLE
+ 	select SERIAL_CORE
+ 	help
+ 	  This driver supports the cell network processor nwp serial
+ 	  device.
+ 
+ config SERIAL_OF_PLATFORM_NWPSERIAL_CONSOLE
+ 	bool "Console on NWP serial port"
+ 	depends on SERIAL_OF_PLATFORM_NWPSERIAL=y
+ 	select SERIAL_CORE_CONSOLE
+ 	help
+ 	  Support for Console on the NWP serial ports.
+ 
  config SERIAL_QE
  	tristate "Freescale QUICC Engine serial port support"