1 files changed, 14 insertions, 10 deletions

diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index a26653fe788c..c79b43cd6014 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -1029,11 +1029,11 @@ config SERIAL_VR41XX_CONSOLE
           a console on a serial port, say Y.  Otherwise, say N.
 
 config SERIAL_JSM
-        tristate "Digi International NEO PCI Support"
+        tristate "Digi International NEO and Classic PCI Support"
         depends on PCI
         select SERIAL_CORE
         help
-          This is a driver for Digi International's Neo series
+          This is a driver for Digi International's Neo and Classic series
           of cards which provide multiple serial ports. You would need
           something like this to connect more than two modems to your Linux
           box, for instance in order to become a dial-in server. This driver
@@ -1281,22 +1281,25 @@ config SERIAL_TIMBERDALE
         Add support for UART controller on timberdale.
 
 config SERIAL_BCM63XX
-        tristate "bcm63xx serial port support"
+        tristate "Broadcom BCM63xx/BCM33xx UART support"
         select SERIAL_CORE
-        depends on BCM63XX
+        depends on MIPS || ARM || COMPILE_TEST
         help
-          If you have a bcm63xx CPU, you can enable its onboard
-          serial port by enabling this options.
+          This enables the driver for the onchip UART core found on
+          the following chipsets:
 
-          To compile this driver as a module, choose M here: the
-          module will be called bcm963xx_uart.
+            BCM33xx (cable modem)
+            BCM63xx/BCM63xxx (DSL)
+            BCM68xx (PON)
+            BCM7xxx (STB) - DOCSIS console
 
 config SERIAL_BCM63XX_CONSOLE
-        bool "Console on bcm63xx serial port"
+        bool "Console on BCM63xx serial port"
         depends on SERIAL_BCM63XX=y
         select SERIAL_CORE_CONSOLE
+        select SERIAL_EARLYCON
         help
-          If you have enabled the serial port on the bcm63xx CPU
+          If you have enabled the serial port on the BCM63xx CPU
           you can make it the console by answering Y to this option.
 
 config SERIAL_GRLIB_GAISLER_APBUART
@@ -1408,6 +1411,7 @@ config SERIAL_MXS_AUART
         depends on ARCH_MXS
         tristate "MXS AUART support"
         select SERIAL_CORE
+        select SERIAL_MCTRL_GPIO if GPIOLIB
         help
           This driver supports the MXS Application UART (AUART) port.