parport_serial: netmos 9855 fix

Fix wrong netmos 9855 serial port configuration.

On loading only one serial port was present and it wasn't working.  After
looking in the data sheet I realized that the base address was wrong.  For
further reference here is lspci and relevant dmesg output:

02:00.0 Communication controller: NetMos Technology PCI 9855 Multi-I/O
Controller (rev 01) (prog-if 02)
        Subsystem: LSI Logic / Symbios Logic Unknown device 0022
        Flags: medium devsel, IRQ 19
        I/O ports at df00 [size=8]
        I/O ports at de00 [size=8]
        I/O ports at dd00 [size=8]
        I/O ports at dc00 [size=8]
        I/O ports at db00 [size=8]
        I/O ports at da00 [size=16]

parport1: PC-style at 0xdd00 [PCSPP,TRISTATE]
parport2: PC-style at 0xdf00 [PCSPP,TRISTATE,EPP]
0000:02:00.0: ttyS0 at I/O 0xdb00 (irq = 19) is a 16550A
0000:02:00.0: ttyS1 at I/O 0xda00 (irq = 19) is a 16550A

Signed-off-by: Christian Pellegrin <chripell@fsfe.org>
Cc: Thomas Richter <thor@math.TU-Berlin.DE>
Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Martin Schitter <ms@gewi.kfunigraz.ac.at>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c
index bd6ad8b38168a43b3def14876deb7095b6117da9..e2e95b36a603e227be8d0d6b03b30996c9f00c6f 100644 (file)
--- a/drivers/parport/parport_serial.c
+++ b/drivers/parport/parport_serial.c
@@ -77,7 +77,7 @@ static struct parport_pc_pci cards[] __devinitdata = {
        /* titan_110l */                { 1, { { 3, -1 }, } },
        /* titan_210l */                { 1, { { 3, -1 }, } },
        /* netmos_9xx5_combo */         { 1, { { 2, -1 }, }, netmos_parallel_init },
-       /* netmos_9855 */               { 1, { { 0, -1 }, }, netmos_parallel_init },
+       /* netmos_9855 */               { 1, { { 2, -1 }, }, netmos_parallel_init },
        /* avlab_1s1p     */            { 1, { { 1, 2}, } },
        /* avlab_1s2p     */            { 2, { { 1, 2}, { 3, 4 },} },
        /* avlab_2s1p     */            { 1, { { 2, 3}, } },
@@ -185,7 +185,7 @@ static struct pciserial_board pci_parport_serial_boards[] __devinitdata = {
                .uart_offset    = 8,
        },
        [netmos_9855] = {
-               .flags          = FL_BASE2 | FL_BASE_BARS,
+               .flags          = FL_BASE4 | FL_BASE_BARS,
                .num_ports      = 1,
                .base_baud      = 115200,
                .uart_offset    = 8,