8250: Oxford Semiconductor Devices

Add support for the OxSemi 'Tornado' devices.

Reformatted and reworked a bit by Alan Cox

Signed-off-by: Lee Howard <lee.howard@mainpine.com>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 19 insertions, 1 deletions

diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index 8a846adf1dc..96f3bdf0ec4 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -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 },