Commit 026fb1e3 authored by Harald Welte's avatar Harald Welte Committed by Russell King

[SERIAL] Fix supprot for AFAVLAB 8port boards in 2.6.x

I didn't yet use one of my AFAVLAB boards with 2.6.x until now.  The
upper 4 ports are not detected at all.  I suppose the bug was
introduced while porting the driver from 2.4.x.

Please consider applying the following patch.  It also adds support
for a new 8 port board called P030.
parent 5d713dd5
...@@ -5601,6 +5601,8 @@ ...@@ -5601,6 +5601,8 @@
14da National Aerospace Laboratories 14da National Aerospace Laboratories
14db AFAVLAB Technology Inc 14db AFAVLAB Technology Inc
2120 TK9902 2120 TK9902
2180 P028
2182 P030
14dc Amplicon Liveline Ltd 14dc Amplicon Liveline Ltd
0000 PCI230 0000 PCI230
0001 PCI242 0001 PCI242
......
...@@ -145,8 +145,10 @@ afavlab_setup(struct pci_dev *dev, struct pci_board *board, ...@@ -145,8 +145,10 @@ afavlab_setup(struct pci_dev *dev, struct pci_board *board,
bar = FL_GET_BASE(board->flags); bar = FL_GET_BASE(board->flags);
if (idx < 4) if (idx < 4)
bar += idx; bar += idx;
else else {
bar = 4;
offset += (idx - 4) * board->uart_offset; offset += (idx - 4) * board->uart_offset;
}
return setup_port(dev, req, bar, offset, board->reg_shift); return setup_port(dev, req, bar, offset, board->reg_shift);
} }
...@@ -1891,6 +1893,9 @@ static struct pci_device_id serial_pci_tbl[] = { ...@@ -1891,6 +1893,9 @@ static struct pci_device_id serial_pci_tbl[] = {
{ PCI_VENDOR_ID_AFAVLAB, PCI_DEVICE_ID_AFAVLAB_P028, { PCI_VENDOR_ID_AFAVLAB, PCI_DEVICE_ID_AFAVLAB_P028,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
pbn_b0_bt_8_115200 }, pbn_b0_bt_8_115200 },
{ PCI_VENDOR_ID_AFAVLAB, PCI_DEVICE_ID_AFAVLAB_P030,
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
pbn_b0_bt_8_115200 },
{ PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_DSERIAL, { PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_DSERIAL,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment