Commit 31ac2f17 authored by Ian Abbott's avatar Ian Abbott Committed by Sasha Levin

serial: 8250_pci: Add MKS Tenta SCOM-0800 and SCOM-0801 cards

[ Upstream commit 1c9c858e ]

The MKS Instruments SCOM-0800 and SCOM-0801 cards (originally by Tenta
Technologies) are 3U CompactPCI serial cards with 4 and 8 serial ports,
respectively.  The first 4 ports are implemented by an OX16PCI954 chip,
and the second 4 ports are implemented by an OX16C954 chip on a local
bus, bridged by the second PCI function of the OX16PCI954.  The ports
are jumper-selectable as RS-232 and RS-422/485, and the UARTs use a
non-standard oscillator frequency of 20 MHz (base_baud = 1250000).
Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
parent 4c47ad35
...@@ -2972,6 +2972,8 @@ enum pci_board_num_t { ...@@ -2972,6 +2972,8 @@ enum pci_board_num_t {
pbn_b0_4_1152000_200, pbn_b0_4_1152000_200,
pbn_b0_8_1152000_200, pbn_b0_8_1152000_200,
pbn_b0_4_1250000,
pbn_b0_2_1843200, pbn_b0_2_1843200,
pbn_b0_4_1843200, pbn_b0_4_1843200,
...@@ -3207,6 +3209,13 @@ static struct pciserial_board pci_boards[] = { ...@@ -3207,6 +3209,13 @@ static struct pciserial_board pci_boards[] = {
.uart_offset = 0x200, .uart_offset = 0x200,
}, },
[pbn_b0_4_1250000] = {
.flags = FL_BASE0,
.num_ports = 4,
.base_baud = 1250000,
.uart_offset = 8,
},
[pbn_b0_2_1843200] = { [pbn_b0_2_1843200] = {
.flags = FL_BASE0, .flags = FL_BASE0,
.num_ports = 2, .num_ports = 2,
...@@ -5895,6 +5904,10 @@ static struct pci_device_id serial_pci_tbl[] = { ...@@ -5895,6 +5904,10 @@ static struct pci_device_id serial_pci_tbl[] = {
{ PCI_DEVICE(0x1c29, 0x1108), .driver_data = pbn_fintek_8 }, { PCI_DEVICE(0x1c29, 0x1108), .driver_data = pbn_fintek_8 },
{ PCI_DEVICE(0x1c29, 0x1112), .driver_data = pbn_fintek_12 }, { PCI_DEVICE(0x1c29, 0x1112), .driver_data = pbn_fintek_12 },
/* MKS Tenta SCOM-080x serial cards */
{ PCI_DEVICE(0x1601, 0x0800), .driver_data = pbn_b0_4_1250000 },
{ PCI_DEVICE(0x1601, 0xa801), .driver_data = pbn_b0_4_1250000 },
/* /*
* These entries match devices with class COMMUNICATION_SERIAL, * These entries match devices with class COMMUNICATION_SERIAL,
* COMMUNICATION_MODEM or COMMUNICATION_MULTISERIAL * COMMUNICATION_MODEM or COMMUNICATION_MULTISERIAL
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment