lkml.org 
[lkml]   [2017]   [Mar]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 47/60] serial: 8250_pci: Add MKS Tenta SCOM-0800 and SCOM-0801 cards
    Date
    From: Ian Abbott <abbotti@mev.co.uk>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit 1c9c858e2ff8ae8024a3d75d2ed080063af43754 upstream.

    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: Ian Abbott <abbotti@mev.co.uk>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/tty/serial/8250/8250_pci.c | 13 +++++++++++++
    1 file changed, 13 insertions(+)

    diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
    index e93eaea14ccc..2e8f75bc54b9 100644
    --- a/drivers/tty/serial/8250/8250_pci.c
    +++ b/drivers/tty/serial/8250/8250_pci.c
    @@ -2388,6 +2388,8 @@ enum pci_board_num_t {
    pbn_b0_4_1152000_200,
    pbn_b0_8_1152000_200,

    + pbn_b0_4_1250000,
    +
    pbn_b0_2_1843200,
    pbn_b0_4_1843200,

    @@ -2610,6 +2612,13 @@ static struct pciserial_board pci_boards[] = {
    .uart_offset = 0x200,
    },

    + [pbn_b0_4_1250000] = {
    + .flags = FL_BASE0,
    + .num_ports = 4,
    + .base_baud = 1250000,
    + .uart_offset = 8,
    + },
    +
    [pbn_b0_2_1843200] = {
    .flags = FL_BASE0,
    .num_ports = 2,
    @@ -5017,6 +5026,10 @@ static struct pci_device_id serial_pci_tbl[] = {
    0,
    0, pbn_exar_XR17V358 },

    + /* 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,
    * COMMUNICATION_MODEM or COMMUNICATION_MULTISERIAL
    --
    2.12.0
    \
     
     \ /
      Last update: 2017-03-14 14:22    [W:2.441 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site