diff options
author | Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com> | 2011-05-09 04:25:20 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-10 17:18:41 -0400 |
commit | 177c2cbf7dc4f6599efa6cd2b514381784f47634 (patch) | |
tree | 614d8e79726b026bec9a8a567046387680c647a1 /drivers/tty | |
parent | 868d1721a2200244a4555193d4adc1133cfb3978 (diff) |
pch_uart: Support new device ML7223 IOH
Support new device OKI SEMICONDUCTOR ML7223 IOH(Input/Output Hub).
The ML7223 IOH is for MP(Media Phone) use.
The ML7223 is companion chip for Intel Atom E6xx series.
The ML7223 is completely compatible for Intel EG20T PCH.
Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty')
-rw-r--r-- | drivers/tty/serial/Kconfig | 12 | ||||
-rw-r--r-- | drivers/tty/serial/pch_uart.c | 8 |
2 files changed, 15 insertions, 5 deletions
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index 84876ec2ed97..2f96ce9924b2 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig | |||
@@ -1577,7 +1577,7 @@ config SERIAL_IFX6X60 | |||
1577 | Support for the IFX6x60 modem devices on Intel MID platforms. | 1577 | Support for the IFX6x60 modem devices on Intel MID platforms. |
1578 | 1578 | ||
1579 | config SERIAL_PCH_UART | 1579 | config SERIAL_PCH_UART |
1580 | tristate "Intel EG20T PCH UART/OKI SEMICONDUCTOR ML7213 IOH" | 1580 | tristate "Intel EG20T PCH / OKI SEMICONDUCTOR IOH(ML7213/ML7223) UART" |
1581 | depends on PCI | 1581 | depends on PCI |
1582 | select SERIAL_CORE | 1582 | select SERIAL_CORE |
1583 | help | 1583 | help |
@@ -1585,10 +1585,12 @@ config SERIAL_PCH_UART | |||
1585 | which is an IOH(Input/Output Hub) for x86 embedded processor. | 1585 | which is an IOH(Input/Output Hub) for x86 embedded processor. |
1586 | Enabling PCH_DMA, this PCH UART works as DMA mode. | 1586 | Enabling PCH_DMA, this PCH UART works as DMA mode. |
1587 | 1587 | ||
1588 | This driver also can be used for OKI SEMICONDUCTOR ML7213 IOH(Input/ | 1588 | This driver also can be used for OKI SEMICONDUCTOR IOH(Input/ |
1589 | Output Hub) which is for IVI(In-Vehicle Infotainment) use. | 1589 | Output Hub), ML7213 and ML7223. |
1590 | ML7213 is companion chip for Intel Atom E6xx series. | 1590 | ML7213 IOH is for IVI(In-Vehicle Infotainment) use and ML7223 IOH is |
1591 | ML7213 is completely compatible for Intel EG20T PCH. | 1591 | for MP(Media Phone) use. |
1592 | ML7213/ML7223 is companion chip for Intel Atom E6xx series. | ||
1593 | ML7213/ML7223 is completely compatible for Intel EG20T PCH. | ||
1592 | 1594 | ||
1593 | config SERIAL_MSM_SMD | 1595 | config SERIAL_MSM_SMD |
1594 | bool "Enable tty device interface for some SMD ports" | 1596 | bool "Enable tty device interface for some SMD ports" |
diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c index 26403b8e4b9b..c63d0d152af6 100644 --- a/drivers/tty/serial/pch_uart.c +++ b/drivers/tty/serial/pch_uart.c | |||
@@ -253,6 +253,8 @@ enum pch_uart_num_t { | |||
253 | pch_ml7213_uart0, | 253 | pch_ml7213_uart0, |
254 | pch_ml7213_uart1, | 254 | pch_ml7213_uart1, |
255 | pch_ml7213_uart2, | 255 | pch_ml7213_uart2, |
256 | pch_ml7223_uart0, | ||
257 | pch_ml7223_uart1, | ||
256 | }; | 258 | }; |
257 | 259 | ||
258 | static struct pch_uart_driver_data drv_dat[] = { | 260 | static struct pch_uart_driver_data drv_dat[] = { |
@@ -263,6 +265,8 @@ static struct pch_uart_driver_data drv_dat[] = { | |||
263 | [pch_ml7213_uart0] = {PCH_UART_8LINE, 0}, | 265 | [pch_ml7213_uart0] = {PCH_UART_8LINE, 0}, |
264 | [pch_ml7213_uart1] = {PCH_UART_2LINE, 1}, | 266 | [pch_ml7213_uart1] = {PCH_UART_2LINE, 1}, |
265 | [pch_ml7213_uart2] = {PCH_UART_2LINE, 2}, | 267 | [pch_ml7213_uart2] = {PCH_UART_2LINE, 2}, |
268 | [pch_ml7223_uart0] = {PCH_UART_8LINE, 0}, | ||
269 | [pch_ml7223_uart1] = {PCH_UART_2LINE, 1}, | ||
266 | }; | 270 | }; |
267 | 271 | ||
268 | static unsigned int default_baud = 9600; | 272 | static unsigned int default_baud = 9600; |
@@ -1534,6 +1538,10 @@ static DEFINE_PCI_DEVICE_TABLE(pch_uart_pci_id) = { | |||
1534 | .driver_data = pch_ml7213_uart1}, | 1538 | .driver_data = pch_ml7213_uart1}, |
1535 | {PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8029), | 1539 | {PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x8029), |
1536 | .driver_data = pch_ml7213_uart2}, | 1540 | .driver_data = pch_ml7213_uart2}, |
1541 | {PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x800C), | ||
1542 | .driver_data = pch_ml7223_uart0}, | ||
1543 | {PCI_DEVICE(PCI_VENDOR_ID_ROHM, 0x800D), | ||
1544 | .driver_data = pch_ml7223_uart1}, | ||
1537 | {0,}, | 1545 | {0,}, |
1538 | }; | 1546 | }; |
1539 | 1547 | ||