[PATCH] parport: NetMOS 9805 interface

Add support for netmos devices to the parallel port driver.

NetMOS 9805 support is already in the kernel, this patch adds the support for
the missing 9735,9855,9755 and 9715 chips.

And another remark: The 9735 and 9835 seem to be chips with serial *and*
parallel interfaces, so I suppose they are already claimed somewhere in the
serial driver.  I don't know whether this causes any problems.  I'm sorry that
I can't test, I've only a 9805 here.  Any idea how these "dual" chips have to
be handled by the kernel?

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index dfc8a84047c2f47760be0d59cdc9edc85bc75465..2d5c04de238020498ea07711f1db17f405450ace 100644 (file)
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -2636,6 +2636,10 @@ enum parport_pc_pci_cards {
        netmos_9805,
        netmos_9815,
        netmos_9855,
+       netmos_9735,
+       netmos_9835,
+       netmos_9755,
+       netmos_9715
 };
 
 
@@ -2709,6 +2713,10 @@ static struct parport_pc_pci {
        /* netmos_9805 */               { 1, { { 0, -1 }, } }, /* untested */
        /* netmos_9815 */               { 2, { { 0, -1 }, { 2, -1 }, } }, /* untested */
        /* netmos_9855 */               { 2, { { 0, -1 }, { 2, -1 }, } }, /* untested */
+       /* netmos_9735 */               { 1, { { 2, 3 }, } },  /* untested */
+       /* netmos_9835 */               { 1, { { 2, 3 }, } },  /* untested */
+        /* netmos_9755 */               { 2, { { 0, 1 }, { 2, 3 },} }, /* untested */
+        /* netmos_9715 */               { 2, { { 0, 1 }, { 2, 3 },} }, /* untested */
 };
 
 static struct pci_device_id parport_pc_pci_tbl[] = {
@@ -2786,6 +2794,14 @@ static struct pci_device_id parport_pc_pci_tbl[] = {
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9815 },
        { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9855,
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9855 },
+       { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9735,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9735 },
+       { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9835,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9835 },
+       { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9755,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9755 },
+       { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9715,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9715 },
        { 0, } /* terminate list */
 };
 MODULE_DEVICE_TABLE(pci,parport_pc_pci_tbl);

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 4cbd2d42157ba46d8ebca5c9cab3c790235a8995..a16c2b5524ba38d68340fa551a73cbcefad3df80 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2313,6 +2313,8 @@
 #define PCI_DEVICE_ID_NETMOS_9815      0x9815
 #define PCI_DEVICE_ID_NETMOS_9835      0x9835
 #define PCI_DEVICE_ID_NETMOS_9855      0x9855
+#define PCI_DEVICE_ID_NETMOS_9755      0x9755
+#define PCI_DEVICE_ID_NETMOS_9715      0x9715
 
 #define PCI_SUBVENDOR_ID_EXSYS         0xd84d
 #define PCI_SUBDEVICE_ID_EXSYS_4014    0x4014