These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / tty / serial / Kconfig

diff --git a/kernel/drivers/tty/serial/Kconfig b/kernel/drivers/tty/serial/Kconfig
index 8cd3534..f38beb2 100644 (file)
--- a/kernel/drivers/tty/serial/Kconfig
+++ b/kernel/drivers/tty/serial/Kconfig
@@ -115,9 +115,9 @@ config SERIAL_SB1250_DUART_CONSOLE
 
 config SERIAL_ATMEL
        bool "AT91 / AT32 on-chip serial port support"
-       depends on ARCH_AT91 || AVR32
+       depends on ARCH_AT91 || AVR32 || COMPILE_TEST
        select SERIAL_CORE
-       select SERIAL_MCTRL_GPIO
+       select SERIAL_MCTRL_GPIO if GPIOLIB
        help
          This enables the driver for the on-chip UARTs of the Atmel
          AT91 and AT32 processors.
@@ -571,7 +571,7 @@ config BFIN_UART3_CTSRTS
 
 config SERIAL_IMX
        tristate "IMX serial port support"
-       depends on ARCH_MXC
+       depends on ARCH_MXC || COMPILE_TEST
        select SERIAL_CORE
        select RATIONAL
        help
@@ -582,6 +582,7 @@ config SERIAL_IMX_CONSOLE
        bool "Console on IMX serial port"
        depends on SERIAL_IMX=y
        select SERIAL_CORE_CONSOLE
+       select SERIAL_EARLYCON if OF
        help
          If you have enabled the serial port on the Freescale IMX
          CPU you can make it the console by answering Y to this option.
@@ -594,7 +595,7 @@ config SERIAL_IMX_CONSOLE
 
 config SERIAL_UARTLITE
        tristate "Xilinx uartlite serial port support"
-       depends on PPC32 || MICROBLAZE || MFD_TIMBERDALE || ARCH_ZYNQ
+       depends on HAS_IOMEM
        select SERIAL_CORE
        help
          Say Y here if you want to use the Xilinx uartlite serial controller.
@@ -728,7 +729,7 @@ config SERIAL_IP22_ZILOG_CONSOLE
 
 config SERIAL_SH_SCI
        tristate "SuperH SCI(F) serial port support"
-       depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST
+       depends on SUPERH || ARCH_SHMOBILE || H8300 || COMPILE_TEST
        select SERIAL_CORE
 
 config SERIAL_SH_SCI_NR_UARTS
@@ -743,7 +744,7 @@ config SERIAL_SH_SCI_CONSOLE
 
 config SERIAL_SH_SCI_DMA
        bool "DMA support"
-       depends on SERIAL_SH_SCI && SH_DMAE
+       depends on SERIAL_SH_SCI && DMA_ENGINE
 
 config SERIAL_PNX8XXX
        bool "Enable PNX8XXX SoCs' UART Support"
@@ -1067,6 +1068,7 @@ config SERIAL_ETRAXFS
        bool "ETRAX FS serial port support"
        depends on ETRAX_ARCH_V32 && OF
        select SERIAL_CORE
+       select SERIAL_MCTRL_GPIO if GPIOLIB
 
 config SERIAL_ETRAXFS_CONSOLE
        bool "ETRAX FS serial console support"
@@ -1179,15 +1181,42 @@ config SERIAL_SCCNXP_CONSOLE
        help
          Support for console on SCCNXP serial ports.
 
+config SERIAL_SC16IS7XX_CORE
+        tristate
+
 config SERIAL_SC16IS7XX
-       tristate "SC16IS7xx serial support"
-       depends on I2C
-       select SERIAL_CORE
-       select REGMAP_I2C if I2C
-       help
-         This selects support for SC16IS7xx serial ports.
-         Supported ICs are SC16IS740, SC16IS741, SC16IS750, SC16IS752,
-         SC16IS760 and SC16IS762.
+        tristate "SC16IS7xx serial support"
+        select SERIAL_CORE
+        depends on (SPI_MASTER && !I2C) || I2C
+        help
+          This selects support for SC16IS7xx serial ports.
+          Supported ICs are SC16IS740, SC16IS741, SC16IS750, SC16IS752,
+          SC16IS760 and SC16IS762. Select supported buses using options below.
+
+config SERIAL_SC16IS7XX_I2C
+        bool "SC16IS7xx for I2C interface"
+        depends on SERIAL_SC16IS7XX
+        depends on I2C
+        select SERIAL_SC16IS7XX_CORE if SERIAL_SC16IS7XX
+        select REGMAP_I2C if I2C
+        default y
+        help
+          Enable SC16IS7xx driver on I2C bus,
+          If required say y, and say n to i2c if not required,
+          Enabled by default to support oldconfig.
+          You must select at least one bus for the driver to be built.
+
+config SERIAL_SC16IS7XX_SPI
+        bool "SC16IS7xx for spi interface"
+        depends on SERIAL_SC16IS7XX
+        depends on SPI_MASTER
+        select SERIAL_SC16IS7XX_CORE if SERIAL_SC16IS7XX
+        select REGMAP_SPI if SPI_MASTER
+        help
+          Enable SC16IS7xx driver on SPI bus,
+          If required say y, and say n to spi if not required,
+          This is additional support to exsisting driver.
+          You must select at least one bus for the driver to be built.
 
 config SERIAL_BFIN_SPORT
        tristate "Blackfin SPORT emulate UART"
@@ -1349,7 +1378,8 @@ config SERIAL_ALTERA_UART_CONSOLE
 
 config SERIAL_IFX6X60
         tristate "SPI protocol driver for Infineon 6x60 modem (EXPERIMENTAL)"
-       depends on GPIOLIB && SPI
+       depends on GPIOLIB || COMPILE_TEST
+       depends on SPI && HAS_DMA
        help
          Support for the IFX6x60 modem devices on Intel MID platforms.
 
@@ -1378,16 +1408,8 @@ config SERIAL_PCH_UART_CONSOLE
          (the system  console is the device which receives all kernel messages and
          warnings and which allows logins in single user mode).
 
-config SERIAL_MSM_SMD
-       bool "Enable tty device interface for some SMD ports"
-       default n
-       depends on MSM_SMD
-       help
-         Enables userspace clients to read and write to some streaming SMD
-         ports via tty device interface for MSM chipset.
-
 config SERIAL_MXS_AUART
-       depends on ARCH_MXS
+       depends on ARCH_MXS || COMPILE_TEST
        tristate "MXS AUART support"
        select SERIAL_CORE
        select SERIAL_MCTRL_GPIO if GPIOLIB
@@ -1524,6 +1546,7 @@ config SERIAL_FSL_LPUART_CONSOLE
        bool "Console on Freescale lpuart serial port"
        depends on SERIAL_FSL_LPUART=y
        select SERIAL_CORE_CONSOLE
+       select SERIAL_EARLYCON
        help
          If you have enabled the lpuart serial port on the Freescale SoCs,
          you can make it the console by answering Y to this option.
@@ -1589,6 +1612,23 @@ config SERIAL_SPRD_CONSOLE
          with "earlycon" on the kernel command line. The console is
          enabled when early_param is processed.
 
+config SERIAL_STM32
+       tristate "STMicroelectronics STM32 serial port support"
+       select SERIAL_CORE
+       depends on ARM || COMPILE_TEST
+       help
+         This driver is for the on-chip Serial Controller on
+         STMicroelectronics STM32 MCUs.
+         USART supports Rx & Tx functionality.
+         It support all industry standard baud rates.
+
+         If unsure, say N.
+
+config SERIAL_STM32_CONSOLE
+       bool "Support for console on STM32"
+       depends on SERIAL_STM32=y
+       select SERIAL_CORE_CONSOLE
+
 endmenu
 
 config SERIAL_MCTRL_GPIO