8250: Oxford Semiconductor Devices
Subsystems (2)
PATCH 1/2 8250: Oxford Semiconductor Devices
From: Lee Howard <[email protected]>
Add support for the OxSemi 'Tornado' devices.
Orginal from Lee Howard
Reformatted and reworked a bit by Alan Cox
Signed-off-by Lee Howard <[email protected]>
Signed-off-by Alan Cox <[email protected]>
---
drivers/parport/parport_pc.c | 20 ++++ drivers/serial/8250_pci.c | 211 ++++++++++++++++++++++++++++++++++++++++++ include/linux/pci_ids.h | 8 ++ 3 files changed, 238 insertions(+), 1 deletions(-)
drivers/parport/parport_pc.c +19 -1
@@ -2791,6 +2791,7 @@ enum parport_pc_pci_cards { oxsemi_952, oxsemi_954, oxsemi_840, + oxsemi_pcie_pport, aks_0100, mobility_pp, netmos_9705,
@@ -2868,6 +2869,7 @@ static struct parport_pc_pci { /* oxsemi_952 */ { 1, { { 0, 1 }, } }, /* oxsemi_954 */ { 1, { { 0, -1 }, } }, /* oxsemi_840 */ { 1, { { 0, 1 }, } }, + /* oxsemi_pcie_pport */ { 1, { { 0, 1 }, } }, /* aks_0100 */ { 1, { { 0, -1 }, } }, /* mobility_pp */ { 1, { { 0, 1 }, } }, /* netmos_9705 */ { 1, { { 0, -1 }, } }, /* untested */
@@ -2928,7 +2930,6 @@ static const struct pci_device_id parport_pc_pci_tbl[] = { { 0x1409, 0x7268, 0x1409, 0x0103, 0, 0, timedia_4008a }, { 0x1409, 0x7268, 0x1409, 0x0104, 0, 0, timedia_4018 }, { 0x1409, 0x7268, 0x1409, 0x9018, 0, 0, timedia_9018a }, - { 0x14f2, 0x0121, PCI_ANY_ID, PCI_ANY_ID, 0, 0, mobility_pp }, { PCI_VENDOR_ID_SYBA, PCI_DEVICE_ID_SYBA_2P_EPP, PCI_ANY_ID, PCI_ANY_ID, 0, 0, syba_2p_epp }, { PCI_VENDOR_ID_SYBA, PCI_DEVICE_ID_SYBA_1P_ECP,
@@ -2946,8 +2947,25 @@ static const struct pci_device_id parport_pc_pci_tbl[] = { PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_954 }, { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_12PCI840, PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_840 }, + { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe840, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_pcie_pport }, + { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe840_G, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_pcie_pport }, + { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe952_0, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_pcie_pport }, + { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe952_0_G, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_pcie_pport }, + { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe952_1, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_pcie_pport }, + { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe952_1_G, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_pcie_pport }, + { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe952_1_U, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_pcie_pport }, + { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe952_1_GU, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_pcie_pport }, { PCI_VENDOR_ID_AKS, PCI_DEVICE_ID_AKS_ALADDINCARD, PCI_ANY_ID, PCI_ANY_ID, 0, 0, aks_0100 }, + { 0x14f2, 0x0121, PCI_ANY_ID, PCI_ANY_ID, 0, 0, mobility_pp },/* NetMos communication controllers */ { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9705, PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9705 },
drivers/serial/8250_pci.c +211 -0
253 lines not on this page · raw message
include/linux/pci_ids.h +8 -0
@@ -1944,6 +1944,14 @@#define PCI_VENDOR_ID_OXSEMI 0x1415#define PCI_DEVICE_ID_OXSEMI_12PCI840 0x8403 +#define PCI_DEVICE_ID_OXSEMI_PCIe840 0xC000 +#define PCI_DEVICE_ID_OXSEMI_PCIe840_G 0xC004 +#define PCI_DEVICE_ID_OXSEMI_PCIe952_0 0xC100 +#define PCI_DEVICE_ID_OXSEMI_PCIe952_0_G 0xC104 +#define PCI_DEVICE_ID_OXSEMI_PCIe952_1 0xC110 +#define PCI_DEVICE_ID_OXSEMI_PCIe952_1_G 0xC114 +#define PCI_DEVICE_ID_OXSEMI_PCIe952_1_U 0xC118 +#define PCI_DEVICE_ID_OXSEMI_PCIe952_1_GU 0xC11C#define PCI_DEVICE_ID_OXSEMI_16PCI954 0x9501#define PCI_DEVICE_ID_OXSEMI_16PCI95N 0x9511#define PCI_DEVICE_ID_OXSEMI_16PCI954PP 0x9513
PATCH 2/2 8250: Add more OxSemi devices
From: Lee Howard <[email protected]>
These have the Mainpine PCI identifier on however
Additional paranoia check for Tornado versions added by Alan Cox
(and this time I remembered to do an stg refresh so that the corrections ended
up in these patches not randomly attached to another diff -- Alan)
Signed-off-by Lee Howard <[email protected]>
Signed-off-by Alan Cox <[email protected]>
---
drivers/serial/8250_pci.c | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-)
drivers/serial/8250_pci.c +25 -5
@@ -1865,6 +1865,11 @@ static int pci_oxsemi_tornado_init(struct pci_dev *dev, struct pciserial_board *unsigned long deviceID;unsigned int number_uarts; +/* OxSemi Tornado devices are all 0xCxxx */ +if (dev->vendor ==PCI_VENDOR_ID_OXSEMI && + (dev->device &0xF000 ) !=0xC000 ) +return 0 ; + p =pci_iomap (dev,0 ,5 );if (p ==NULL )return -ENOMEM ;
@@ -1893,7 +1898,8 @@ pciserial_init_ports(struct pci_dev *dev, struct pciserial_board *board)/* * Find number of ports on board */ -if (dev->vendor ==PCI_VENDOR_ID_OXSEMI ) +if (dev->vendor ==PCI_VENDOR_ID_OXSEMI || + dev->vendor ==PCI_VENDOR_ID_MAINPINE )pci_oxsemi_tornado_init (dev, board); nr_ports = board->num_ports;
@@ -2375,9 +2381,9 @@ static struct pci_device_id serial_pci_tbl[] = {PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , pbn_b0_bt_2_921600 }, -/* -* Oxford Semiconductor Inc. Tornado PCI express device range. -*/ +/* +* Oxford Semiconductor Inc. Tornado PCI express device range. +*/ { PCI_VENDOR_ID_OXSEMI, 0xc101, /* OXPCIe952 1 Legacy UART */PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , pbn_b0_1_4000000 },
@@ -2510,7 +2516,21 @@ static struct pci_device_id serial_pci_tbl[] = { {PCI_VENDOR_ID_OXSEMI ,0xc4cf ,/* OXPCIe200 1 Native UART */ PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , pbn_oxsemi_1_4000000 }, - +/* +* Mainpine Inc. IQ Express "Rev3" utilizing OxSemi Tornado +*/ + { PCI_VENDOR_ID_MAINPINE, 0x4000, /* IQ Express 1 Port V.34 Super-G3 Fax */ +PCI_VENDOR_ID_MAINPINE ,0x4001 ,0 ,0 , + pbn_oxsemi_1_4000000 }, + { PCI_VENDOR_ID_MAINPINE, 0x4000, /* IQ Express 2 Port V.34 Super-G3 Fax */ +PCI_VENDOR_ID_MAINPINE ,0x4002 ,0 ,0 , + pbn_oxsemi_2_4000000 }, + { PCI_VENDOR_ID_MAINPINE, 0x4000, /* IQ Express 4 Port V.34 Super-G3 Fax */ +PCI_VENDOR_ID_MAINPINE ,0x4004 ,0 ,0 , + pbn_oxsemi_4_4000000 }, + { PCI_VENDOR_ID_MAINPINE, 0x4000, /* IQ Express 8 Port V.34 Super-G3 Fax */ +PCI_VENDOR_ID_MAINPINE ,0x4008 ,0 ,0 , + pbn_oxsemi_8_4000000 },/* * SBS Technologies, Inc. P-Octal and PMC-OCTPRO cards, * from [email protected]