Merge tag 'sound-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[karo-tx-linux.git] / drivers / tty / serial / Kconfig

diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 25c1d7bc010043b15f1676660bef7577150252cb..6117ac8da48f739fc4bf904b5a52db31b5861b50 100644 (file)
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -438,17 +438,27 @@ config SERIAL_MPSC_CONSOLE
          Say Y here if you want to support a serial console on a Marvell MPSC.
 
 config SERIAL_PXA
-       bool "PXA serial port support"
+       bool "PXA serial port support (DEPRECATED)"
        depends on ARCH_PXA || ARCH_MMP
        select SERIAL_CORE
+       select SERIAL_8250_PXA if SERIAL_8250=y
+       select SERIAL_PXA_NON8250 if !SERIAL_8250=y
        help
          If you have a machine based on an Intel XScale PXA2xx CPU you
          can enable its onboard serial ports by enabling this option.
 
+         Unless you have a specific need, you should use SERIAL_8250_PXA
+         instead of this.
+
+config SERIAL_PXA_NON8250
+       bool
+       depends on !SERIAL_8250
+
 config SERIAL_PXA_CONSOLE
-       bool "Console on PXA serial port"
+       bool "Console on PXA serial port (DEPRECATED)"
        depends on SERIAL_PXA
        select SERIAL_CORE_CONSOLE
+       select SERIAL_8250_CONSOLE if SERIAL_8250=y
        help
          If you have enabled the serial port on the Intel XScale PXA
          CPU you can make it the console by answering Y to this option.
@@ -460,6 +470,9 @@ config SERIAL_PXA_CONSOLE
          your boot loader (lilo or loadlin) about how to pass options to the
          kernel at boot time.)
 
+         Unless you have a specific need, you should use SERIAL_8250_PXA
+         and SERIAL_8250_CONSOLE instead of this.
+
 config SERIAL_SA1100
        bool "SA1100 serial port support"
        depends on ARCH_SA1100
@@ -1148,6 +1161,7 @@ config SERIAL_LANTIQ
        depends on LANTIQ
        select SERIAL_CORE
        select SERIAL_CORE_CONSOLE
+       select SERIAL_EARLYCON
        help
          Support for console and UART on Lantiq SoCs.
 
@@ -1626,7 +1640,7 @@ config SERIAL_STM32
        tristate "STMicroelectronics STM32 serial port support"
        select SERIAL_CORE
        depends on HAS_DMA
-       depends on ARM || COMPILE_TEST
+       depends on ARCH_STM32 || COMPILE_TEST
        help
          This driver is for the on-chip Serial Controller on
          STMicroelectronics STM32 MCUs.