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

diff --cc arch/x86/include/asm/mrst.h
Simple merge

diff --cc drivers/tty/serial/Kconfig
index d202c31ae92d6184ae095612e0e1f623e8559b68,3d86bdaee0473d79598ff72f2366a7f3016173d9..14cc81fc748de11d533882f3fa58e87f63d8398c
--- 1/drivers/tty/serial/Kconfig
--- 2/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@@ -1527,13 -1568,22 +1527,22 @@@ config SERIAL_PCH_UAR
          which is an IOH(Input/Output Hub) for x86 embedded processor.
          Enabling PCH_DMA, this PCH UART works as DMA mode.
  
 -        This driver also can be used for OKI SEMICONDUCTOR IOH(Input/
 -        Output Hub), ML7213 and ML7223.
 -        ML7213 IOH is for IVI(In-Vehicle Infotainment) use and ML7223 IOH is
 -        for MP(Media Phone) use.
 -        ML7213/ML7223 is companion chip for Intel Atom E6xx series.
 -        ML7213/ML7223 is completely compatible for Intel EG20T PCH.
 +        This driver also can be used for LAPIS Semiconductor IOH(Input/
 +        Output Hub), ML7213, ML7223 and ML7831.
 +        ML7213 IOH is for IVI(In-Vehicle Infotainment) use, ML7223 IOH is
 +        for MP(Media Phone) use and ML7831 IOH is for general purpose use.
 +        ML7213/ML7223/ML7831 is companion chip for Intel Atom E6xx series.
 +        ML7213/ML7223/ML7831 is completely compatible for Intel EG20T PCH.
  
+ config SERIAL_PCH_UART_CONSOLE
+       bool "Support for console on Intel EG20T PCH UART/OKI SEMICONDUCTOR ML7213 IOH"
+       depends on SERIAL_PCH_UART=y
+       select SERIAL_CORE_CONSOLE
+       help
+         Say Y here if you wish to use the PCH UART as the system 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

diff --cc drivers/tty/serial/atmel_serial.c
Simple merge

diff --cc drivers/tty/serial/mfd.c
Simple merge

diff --cc drivers/tty/serial/pch_uart.c
index d6aba8c087e4784370648976c0d018a569c374f4,b950d059a78141d90697a1a951c3f3401c75af6c..de0f613ed6f56051df309abc3ad25ea804081006
--- 1/drivers/tty/serial/pch_uart.c
--- 2/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@@ -272,10 -277,11 +279,13 @@@ static struct pch_uart_driver_data drv_
        [pch_ml7213_uart2] = {PCH_UART_2LINE, 2},
        [pch_ml7223_uart0] = {PCH_UART_8LINE, 0},
        [pch_ml7223_uart1] = {PCH_UART_2LINE, 1},
 +      [pch_ml7831_uart0] = {PCH_UART_8LINE, 0},
 +      [pch_ml7831_uart1] = {PCH_UART_2LINE, 1},
  };
  
+ #ifdef CONFIG_SERIAL_PCH_UART_CONSOLE
+ static struct eg20t_port *pch_uart_ports[PCH_UART_NR];
+ #endif
  static unsigned int default_baud = 9600;
  static const int trigger_level_256[4] = { 1, 64, 128, 224 };
  static const int trigger_level_64[4] = { 1, 16, 32, 56 };

diff --cc include/linux/serial_core.h
Simple merge