aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrauth.Julien <Krauth.Julien@addi-data.com>2009-10-26 19:50:04 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-29 10:39:30 -0400
commit1b62cbf2140df510a56d38b9d49df2aae95cd0d2 (patch)
treec9e589807ba5eccb16dd0f2f4b1cb9a01fa0a4d8
parent9d09daf8e891e6ed60f96fbaf765ba7bced8bad1 (diff)
serial: add ADDI-DATA GmbH PCI-Express communication cards in 8250_pci.c and pci_ids.h
Add support for ADDI-DATA GmbH PCI-Express communication cards: APCIe-7300 APCIe-7420 APCIe-7500 APCIe-7800 Warning: 8250_pci.c depends on pci_ids.h. 8250_pci.c Signed-off-by: Krauth Julien <Krauth.Julien@addi-data.com> Acked-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/serial/8250_pci.c67
-rw-r--r--include/linux/pci_ids.h4
2 files changed, 71 insertions, 0 deletions
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index e7108e75653d..329469369908 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -1566,6 +1566,10 @@ enum pci_board_num_t {
1566 pbn_ni8430_4, 1566 pbn_ni8430_4,
1567 pbn_ni8430_8, 1567 pbn_ni8430_8,
1568 pbn_ni8430_16, 1568 pbn_ni8430_16,
1569 pbn_ADDIDATA_PCIe_1_3906250,
1570 pbn_ADDIDATA_PCIe_2_3906250,
1571 pbn_ADDIDATA_PCIe_4_3906250,
1572 pbn_ADDIDATA_PCIe_8_3906250,
1569}; 1573};
1570 1574
1571/* 1575/*
@@ -2185,6 +2189,37 @@ static struct pciserial_board pci_boards[] __devinitdata = {
2185 .uart_offset = 0x10, 2189 .uart_offset = 0x10,
2186 .first_offset = 0x800, 2190 .first_offset = 0x800,
2187 }, 2191 },
2192 /*
2193 * ADDI-DATA GmbH PCI-Express communication cards <info@addi-data.com>
2194 */
2195 [pbn_ADDIDATA_PCIe_1_3906250] = {
2196 .flags = FL_BASE0,
2197 .num_ports = 1,
2198 .base_baud = 3906250,
2199 .uart_offset = 0x200,
2200 .first_offset = 0x1000,
2201 },
2202 [pbn_ADDIDATA_PCIe_2_3906250] = {
2203 .flags = FL_BASE0,
2204 .num_ports = 2,
2205 .base_baud = 3906250,
2206 .uart_offset = 0x200,
2207 .first_offset = 0x1000,
2208 },
2209 [pbn_ADDIDATA_PCIe_4_3906250] = {
2210 .flags = FL_BASE0,
2211 .num_ports = 4,
2212 .base_baud = 3906250,
2213 .uart_offset = 0x200,
2214 .first_offset = 0x1000,
2215 },
2216 [pbn_ADDIDATA_PCIe_8_3906250] = {
2217 .flags = FL_BASE0,
2218 .num_ports = 8,
2219 .base_baud = 3906250,
2220 .uart_offset = 0x200,
2221 .first_offset = 0x1000,
2222 },
2188}; 2223};
2189 2224
2190static const struct pci_device_id softmodem_blacklist[] = { 2225static const struct pci_device_id softmodem_blacklist[] = {
@@ -3556,6 +3591,38 @@ static struct pci_device_id serial_pci_tbl[] = {
3556 0, 3591 0,
3557 pbn_b0_8_115200 }, 3592 pbn_b0_8_115200 },
3558 3593
3594 { PCI_VENDOR_ID_ADDIDATA,
3595 PCI_DEVICE_ID_ADDIDATA_APCIe7500,
3596 PCI_ANY_ID,
3597 PCI_ANY_ID,
3598 0,
3599 0,
3600 pbn_ADDIDATA_PCIe_4_3906250 },
3601
3602 { PCI_VENDOR_ID_ADDIDATA,
3603 PCI_DEVICE_ID_ADDIDATA_APCIe7420,
3604 PCI_ANY_ID,
3605 PCI_ANY_ID,
3606 0,
3607 0,
3608 pbn_ADDIDATA_PCIe_2_3906250 },
3609
3610 { PCI_VENDOR_ID_ADDIDATA,
3611 PCI_DEVICE_ID_ADDIDATA_APCIe7300,
3612 PCI_ANY_ID,
3613 PCI_ANY_ID,
3614 0,
3615 0,
3616 pbn_ADDIDATA_PCIe_1_3906250 },
3617
3618 { PCI_VENDOR_ID_ADDIDATA,
3619 PCI_DEVICE_ID_ADDIDATA_APCIe7800,
3620 PCI_ANY_ID,
3621 PCI_ANY_ID,
3622 0,
3623 0,
3624 pbn_ADDIDATA_PCIe_8_3906250 },
3625
3559 { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9835, 3626 { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9835,
3560 PCI_VENDOR_ID_IBM, 0x0299, 3627 PCI_VENDOR_ID_IBM, 0x0299,
3561 0, 0, pbn_b0_bt_2_115200 }, 3628 0, 0, pbn_b0_bt_2_115200 },
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 86257a412732..df48628d870b 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2160,6 +2160,10 @@
2160#define PCI_DEVICE_ID_ADDIDATA_APCI7420_3 0x700D 2160#define PCI_DEVICE_ID_ADDIDATA_APCI7420_3 0x700D
2161#define PCI_DEVICE_ID_ADDIDATA_APCI7300_3 0x700E 2161#define PCI_DEVICE_ID_ADDIDATA_APCI7300_3 0x700E
2162#define PCI_DEVICE_ID_ADDIDATA_APCI7800_3 0x700F 2162#define PCI_DEVICE_ID_ADDIDATA_APCI7800_3 0x700F
2163#define PCI_DEVICE_ID_ADDIDATA_APCIe7300 0x7010
2164#define PCI_DEVICE_ID_ADDIDATA_APCIe7420 0x7011
2165#define PCI_DEVICE_ID_ADDIDATA_APCIe7500 0x7012
2166#define PCI_DEVICE_ID_ADDIDATA_APCIe7800 0x7013
2163 2167
2164#define PCI_VENDOR_ID_PDC 0x15e9 2168#define PCI_VENDOR_ID_PDC 0x15e9
2165 2169