[PATCH] extra parport IDs

diff --git a/drivers/parport/ChangeLog b/drivers/parport/ChangeLog
index 5f641fdb808c916c067b20c9cfd320c0a71b813f..692415edb1537e5dd490e50a7f1a00eba6e116bc 100644 (file)
--- a/drivers/parport/ChangeLog
+++ b/drivers/parport/ChangeLog
@@ -1,8 +1,7 @@
-2001-11-14  Tim Waugh  <twaugh@redhat.com>
+2002-04-25  Tim Waugh  <twaugh@redhat.com>
 
-       * parport_pc.c (parport_pc_pci_probe): Hooks for PCI cards before
-       and after probing for ports.
-       * parport_serial.c (parport_register): Likewise.
+       * parport_serial.c, parport_pc.c: Move some SIIG cards around.
+       Patch from Andrey Panin.
 
 2002-01-20  Tim Waugh  <twaugh@redhat.com>
 
@@ -21,17 +20,17 @@
        * daisy.c: Apply patch from Max Vorobiev to make parport_daisy_select
        work for ECP/EPP modes.
 
-2002-01-04  Tim Waugh  <twaugh@redhat.com>
-
-       * share.c (parport_claim_or_block): Sleep interruptibly to prevent
-       a possible deadlock.
-
 2002-01-13  Niels Kristian Bech Jensen  <nkbj@image.dk>
 
        * parport_pc.c: Change some occurrences of frob_set_mode to
        ECR_WRITE.  This fixes PLIP.
 
-2001-10-25  Damian Gruszka  <damian.gruszka@VisionSystems.de>
+2002-01-04  Tim Waugh  <twaugh@redhat.com>
+
+       * share.c (parport_claim_or_block): Sleep interruptibly to prevent
+       a possible deadlock.
+
+2001-12-07  Damian Gruszka  <damian.gruszka@VisionSystems.de>
 
        * parport_pc.c (ECR_WRITE): Define.  If there are forbidden bits
        in the ECR register for some chips, this will be a useful place to
@@ -68,7 +67,7 @@
        (parport_irq_probe): If no IRQ is found, take ackIntEn out of the
        writable bit set.
 
-2001-10-25  Tim Waugh  <twaugh@redhat.com>
+2001-12-07  Tim Waugh  <twaugh@redhat.com>
 
        * parport_pc.c (parport_pc_fifo_write_block_pio): Correct typo.
        (parport_pc_init_state): Only set ackIntEn if we know which IRQ
@@ -85,6 +84,16 @@
        too buggy at the moment.  Use 'dma=auto' to restore the previous
        behaviour.
 
+2001-12-07  Tim Waugh  <twaugh@redhat.com>
+
+       * daisy.c (DEBUG): Undefine.
+
+2001-12-06  Tim Waugh  <twaugh@redhat.com>
+
+       * ieee1284_ops.c (parport_ieee1284_ecp_read_data): Mask off
+       PARPORT_CONTROL_AUTOFD as well.  Bug spotted by Joe
+       <joeja@mindspring.com>.
+
 2001-12-03  Rich Liu  <Rich.Liu@ite.com.tw>
 
        * parport_pc.c (sio_ite_8872_probe): ITE8873 is a single-port
@@ -94,11 +103,11 @@
 
        * parport_pc.c: Fix compiler warning.
 
-2001-12-06  Tim Waugh  <twaugh@redhat.com>
+2001-11-14  Tim Waugh  <twaugh@redhat.com>
 
-       * ieee1284_ops.c (parport_ieee1284_ecp_read_data): Mask off
-       PARPORT_CONTROL_AUTOFD as well.  Bug spotted by Joe
-       <joeja@mindspring.com>.
+       * parport_pc.c (parport_pc_pci_probe): Hooks for PCI cards before
+       and after probing for ports.
+       * parport_serial.c (parport_register): Likewise.
 
 2001-11-12  Tim Waugh  <twaugh@redhat.com>
 

diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c
index 39a78affab4bdd99fc6e659595fa25189bc4d82d..f80f9301314d764d3ee6690a27e97d1f4624c574 100644 (file)
--- a/drivers/parport/parport_serial.c
+++ b/drivers/parport/parport_serial.c
@@ -41,6 +41,11 @@ enum parport_pc_pci_cards {
        avlab_2s1p,
        avlab_2s1p_650,
        avlab_2s1p_850,
+       siig_1s1p_10x,
+       siig_2s1p_10x,
+       siig_2p1s_20x,
+       siig_1s1p_20x,
+       siig_2s1p_20x,
 };
 
 
@@ -74,6 +79,11 @@ static struct parport_pc_pci {
        /* avlab_2s1p     */            { 1, { { 2, 3}, } },
        /* avlab_2s1p_650 */            { 1, { { 2, 3}, } },
        /* avlab_2s1p_850 */            { 1, { { 2, 3}, } },
+       /* siig_1s1p_10x */             { 1, { { 3, 4 }, } },
+       /* siig_2s1p_10x */             { 1, { { 4, 5 }, } },
+       /* siig_2p1s_20x */             { 2, { { 1, 2 }, { 3, 4 }, } },
+       /* siig_1s1p_20x */             { 1, { { 1, 2 }, } },
+       /* siig_2s1p_20x */             { 1, { { 2, 3 }, } },
 };
 
 static struct pci_device_id parport_serial_pci_tbl[] __devinitdata = {
@@ -92,6 +102,37 @@ static struct pci_device_id parport_serial_pci_tbl[] __devinitdata = {
        { 0x14db, 0x2160, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p},
        { 0x14db, 0x2161, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p_650},
        { 0x14db, 0x2162, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p_850},
+       { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_550,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x },
+       { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_650,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x },
+       { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_850,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x },
+       { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_550,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x },
+       { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_650,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x },
+       { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_850,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x },
+       { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_550,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x },
+       { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_650,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x },
+       { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_850,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x },
+       { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_550,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x },
+       { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_650,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_20x },
+       { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_850,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_20x },
+       { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_550,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x },
+       { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_650,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x },
+       { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_850,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x },
+
        { 0, } /* terminate list */
 };
 MODULE_DEVICE_TABLE(pci,parport_serial_pci_tbl);
@@ -107,6 +148,16 @@ struct pci_board_no_ids {
        int first_uart_offset;
 };
 
+static int __devinit siig10x_init_fn(struct pci_dev *dev, struct pci_board_no_ids *board, int enable)
+{
+       return pci_siig10x_fn(dev, NULL, enable);
+}
+
+static int __devinit siig20x_init_fn(struct pci_dev *dev, struct pci_board_no_ids *board, int enable)
+{
+       return pci_siig20x_fn(dev, NULL, enable);
+}
+
 static struct pci_board_no_ids pci_boards[] __devinitdata = {
        /*
         * PCI Flags, Number of Ports, Base (Maximum) Baud Rate,
@@ -129,6 +180,11 @@ static struct pci_board_no_ids pci_boards[] __devinitdata = {
 /* avlab_2s1p (n/t) */ { SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 },
 /* avlab_2s1p_650 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 },
 /* avlab_2s1p_850 (nt)*/{ SPCI_FL_BASE0 | SPCI_FL_BASE_TABLE, 2, 115200 },
+/* siig_1s1p_10x */    { SPCI_FL_BASE2, 1, 460800, 0, 0, siig10x_init_fn },
+/* siig_2s1p_10x */    { SPCI_FL_BASE2, 1, 921600, 0, 0, siig10x_init_fn },
+/* siig_2p1s_20x */    { SPCI_FL_BASE0, 1, 921600, 0, 0, siig20x_init_fn },
+/* siig_1s1p_20x */    { SPCI_FL_BASE0, 1, 921600, 0, 0, siig20x_init_fn },
+/* siig_2s1p_20x */    { SPCI_FL_BASE0, 1, 921600, 0, 0, siig20x_init_fn },
 };
 
 struct parport_serial_private {