diff options
author | Lytochkin Boris <lytboris@gmail.com> | 2010-07-26 02:02:26 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-10 16:47:45 -0400 |
commit | e847003f00d5eca3e3b3a6a1199f82b51293faf6 (patch) | |
tree | 0d292e9844cae58c26cee9378c4b9607e023fead /drivers/serial/8250_pci.c | |
parent | f5e92c3f9ca148181f1baaec8db271845b2420f0 (diff) |
serial: add support for OX16PCI958 card
Signed-off-by: Lytochkin Boris <lytboris@gmail.com>
Tested-by: Lytochkin Boris <lytboris@gmail.com>
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/serial/8250_pci.c')
-rw-r--r-- | drivers/serial/8250_pci.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c index 746a44621d91..53be4d35a0aa 100644 --- a/drivers/serial/8250_pci.c +++ b/drivers/serial/8250_pci.c | |||
@@ -994,6 +994,7 @@ static int skip_tx_en_setup(struct serial_private *priv, | |||
994 | #define PCI_DEVICE_ID_TITAN_800E 0xA014 | 994 | #define PCI_DEVICE_ID_TITAN_800E 0xA014 |
995 | #define PCI_DEVICE_ID_TITAN_200EI 0xA016 | 995 | #define PCI_DEVICE_ID_TITAN_200EI 0xA016 |
996 | #define PCI_DEVICE_ID_TITAN_200EISI 0xA017 | 996 | #define PCI_DEVICE_ID_TITAN_200EISI 0xA017 |
997 | #define PCI_DEVICE_ID_OXSEMI_16PCI958 0x9538 | ||
997 | 998 | ||
998 | /* Unknown vendors/cards - this should not be in linux/pci_ids.h */ | 999 | /* Unknown vendors/cards - this should not be in linux/pci_ids.h */ |
999 | #define PCI_SUBDEVICE_ID_UNKNOWN_0x1584 0x1584 | 1000 | #define PCI_SUBDEVICE_ID_UNKNOWN_0x1584 0x1584 |
@@ -1542,6 +1543,8 @@ enum pci_board_num_t { | |||
1542 | pbn_b2_4_921600, | 1543 | pbn_b2_4_921600, |
1543 | pbn_b2_8_921600, | 1544 | pbn_b2_8_921600, |
1544 | 1545 | ||
1546 | pbn_b2_8_1152000, | ||
1547 | |||
1545 | pbn_b2_bt_1_115200, | 1548 | pbn_b2_bt_1_115200, |
1546 | pbn_b2_bt_2_115200, | 1549 | pbn_b2_bt_2_115200, |
1547 | pbn_b2_bt_4_115200, | 1550 | pbn_b2_bt_4_115200, |
@@ -1960,6 +1963,13 @@ static struct pciserial_board pci_boards[] __devinitdata = { | |||
1960 | .uart_offset = 8, | 1963 | .uart_offset = 8, |
1961 | }, | 1964 | }, |
1962 | 1965 | ||
1966 | [pbn_b2_8_1152000] = { | ||
1967 | .flags = FL_BASE2, | ||
1968 | .num_ports = 8, | ||
1969 | .base_baud = 1152000, | ||
1970 | .uart_offset = 8, | ||
1971 | }, | ||
1972 | |||
1963 | [pbn_b2_bt_1_115200] = { | 1973 | [pbn_b2_bt_1_115200] = { |
1964 | .flags = FL_BASE2|FL_BASE_BARS, | 1974 | .flags = FL_BASE2|FL_BASE_BARS, |
1965 | .num_ports = 1, | 1975 | .num_ports = 1, |
@@ -2875,6 +2885,9 @@ static struct pci_device_id serial_pci_tbl[] = { | |||
2875 | { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI952, | 2885 | { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI952, |
2876 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | 2886 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, |
2877 | pbn_b0_bt_2_921600 }, | 2887 | pbn_b0_bt_2_921600 }, |
2888 | { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI958, | ||
2889 | PCI_ANY_ID , PCI_ANY_ID, 0, 0, | ||
2890 | pbn_b2_8_1152000 }, | ||
2878 | 2891 | ||
2879 | /* | 2892 | /* |
2880 | * Oxford Semiconductor Inc. Tornado PCI express device range. | 2893 | * Oxford Semiconductor Inc. Tornado PCI express device range. |