From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 9 Dec 2011 04:01:59 +0000 (+1100)
Subject: Merge remote-tracking branch 'tty/tty-next'
X-Git-Tag: next-20111209~15
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ac4efdb5de7906042a5ba3ca4a57e1fcced8c41c;p=karo-tx-linux.git

Merge remote-tracking branch 'tty/tty-next'

Conflicts:
	drivers/tty/serial/Kconfig
	drivers/tty/serial/Makefile
---

ac4efdb5de7906042a5ba3ca4a57e1fcced8c41c
diff --cc drivers/tty/serial/Kconfig
index 127854226f32,705d2dc39c9a..5faee4144078
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@@ -495,6 -495,68 +495,28 @@@ config SERIAL_SAMSUNG_CONSOL
  	  your boot loader about how to pass options to the kernel at
  	  boot time.)
  
 -config SERIAL_S3C2410
 -	tristate "Samsung S3C2410 Serial port support"
 -	depends on SERIAL_SAMSUNG && CPU_S3C2410
 -	default y if CPU_S3C2410
 -	help
 -	  Serial port support for the Samsung S3C2410 SoC
 -
 -config SERIAL_S3C2412
 -	tristate "Samsung S3C2412/S3C2413 Serial port support"
 -	depends on SERIAL_SAMSUNG && CPU_S3C2412
 -	default y if CPU_S3C2412
 -	help
 -	  Serial port support for the Samsung S3C2412 and S3C2413 SoC
 -
 -config SERIAL_S3C2440
 -	tristate "Samsung S3C2440/S3C2442/S3C2416 Serial port support"
 -	depends on SERIAL_SAMSUNG && (CPU_S3C2440 || CPU_S3C2442 || CPU_S3C2416)
 -	default y if CPU_S3C2440
 -	default y if CPU_S3C2442
 -	select SERIAL_SAMSUNG_UARTS_4 if CPU_S3C2416
 -	help
 -	  Serial port support for the Samsung S3C2440, S3C2416 and S3C2442 SoC
 -
 -config SERIAL_S3C6400
 -	tristate "Samsung S3C6400/S3C6410/S5P6440/S5P6450/S5PC100 Serial port support"
 -	depends on SERIAL_SAMSUNG && (CPU_S3C6400 || CPU_S3C6410 || CPU_S5P6440 || CPU_S5P6450 || CPU_S5PC100)
 -	select SERIAL_SAMSUNG_UARTS_4
 -	default y
 -	help
 -	  Serial port support for the Samsung S3C6400, S3C6410, S5P6440, S5P6450
 -	  and S5PC100 SoCs
 -
 -config SERIAL_S5PV210
 -	tristate "Samsung S5PV210 Serial port support"
 -	depends on SERIAL_SAMSUNG && (CPU_S5PV210 || CPU_EXYNOS4210 || SOC_EXYNOS4212)
 -	select SERIAL_SAMSUNG_UARTS_4 if (CPU_S5PV210 || CPU_EXYNOS4210 || SOC_EXYNOS4212)
 -	default y
 -	help
 -	  Serial port support for Samsung's S5P Family of SoC's
 -
+ config SERIAL_SIRFSOC
+         tristate "SiRF SoC Platform Serial port support"
+         depends on ARM && ARCH_PRIMA2
+         select SERIAL_CORE
+         help
+           Support for the on-chip UART on the CSR SiRFprimaII series,
+           providing /dev/ttySiRF0, 1 and 2 (note, some machines may not
+           provide all of these ports, depending on how the serial port
+           pins are configured).
+ 
+ config SERIAL_SIRFSOC_CONSOLE
+         bool "Support for console on SiRF SoC serial port"
+         depends on SERIAL_SIRFSOC=y
+         select SERIAL_CORE_CONSOLE
+         help
+           Even if you say Y here, the currently visible virtual console
+           (/dev/tty0) will still be used as the system console by default, but
+           you can alter that using a kernel command line option such as
+           "console=ttySiRFx". (Try "man bootparam" or see the documentation of
+           your boot loader about how to pass options to the kernel at
+           boot time.)
+ 
  config SERIAL_MAX3100
  	tristate "MAX3100 support"
  	depends on SPI
diff --cc drivers/tty/serial/Makefile
index 62f7d285db55,af57089ddb67..e19ca06f32ac
--- a/drivers/tty/serial/Makefile
+++ b/drivers/tty/serial/Makefile
@@@ -89,4 -94,4 +89,5 @@@ obj-$(CONFIG_SERIAL_MSM_SMD)	+= msm_smd
  obj-$(CONFIG_SERIAL_MXS_AUART) += mxs-auart.o
  obj-$(CONFIG_SERIAL_LANTIQ)	+= lantiq.o
  obj-$(CONFIG_SERIAL_XILINX_PS_UART) += xilinx_uartps.o
 +obj-$(CONFIG_SERIAL_AR933X)   += ar933x_uart.o
+ obj-$(CONFIG_SERIAL_SIRFSOC) += sirfsoc_uart.o