Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge master.kernel.org:/home/rmk/linux-2.6-serial
+27
-1
+25
-1
drivers/serial/8250_pci.c
+25
-1
drivers/serial/8250_pci.c
···
152
152
rc = 4;
153
153
break;
154
154
case PCI_DEVICE_ID_HP_DIVA_POWERBAR:
155
+
case PCI_DEVICE_ID_HP_DIVA_HURRICANE:
155
156
rc = 1;
156
157
break;
157
158
}
···
227
226
}
228
227
229
228
irq_config = 0x41;
230
-
if (dev->vendor == PCI_VENDOR_ID_PANACOM)
229
+
if (dev->vendor == PCI_VENDOR_ID_PANACOM ||
230
+
dev->subsystem_vendor == PCI_SUBVENDOR_ID_EXSYS) {
231
231
irq_config = 0x43;
232
+
}
232
233
if ((dev->vendor == PCI_VENDOR_ID_PLX) &&
233
234
(dev->device == PCI_DEVICE_ID_PLX_ROMULUS)) {
234
235
/*
···
667
664
{
668
665
.vendor = PCI_VENDOR_ID_PLX,
669
666
.device = PCI_DEVICE_ID_PLX_9050,
667
+
.subvendor = PCI_SUBVENDOR_ID_EXSYS,
668
+
.subdevice = PCI_SUBDEVICE_ID_EXSYS_4055,
669
+
.init = pci_plx9050_init,
670
+
.setup = pci_default_setup,
671
+
.exit = __devexit_p(pci_plx9050_exit),
672
+
},
673
+
{
674
+
.vendor = PCI_VENDOR_ID_PLX,
675
+
.device = PCI_DEVICE_ID_PLX_9050,
670
676
.subvendor = PCI_SUBVENDOR_ID_KEYSPAN,
671
677
.subdevice = PCI_SUBDEVICE_ID_KEYSPAN_SX2,
672
678
.init = pci_plx9050_init,
···
939
927
pbn_panacom,
940
928
pbn_panacom2,
941
929
pbn_panacom4,
930
+
pbn_exsys_4055,
942
931
pbn_plx_romulus,
943
932
pbn_oxsemi,
944
933
pbn_intel_i960,
···
1303
1290
.base_baud = 921600,
1304
1291
.uart_offset = 0x400,
1305
1292
.reg_shift = 7,
1293
+
},
1294
+
1295
+
[pbn_exsys_4055] = {
1296
+
.flags = FL_BASE2,
1297
+
.num_ports = 4,
1298
+
.base_baud = 115200,
1299
+
.uart_offset = 8,
1306
1300
},
1307
1301
1308
1302
/* I think this entry is broken - the first_offset looks wrong --rmk */
···
1873
1853
PCI_SUBVENDOR_ID_CHASE_PCIRAS,
1874
1854
PCI_SUBDEVICE_ID_CHASE_PCIRAS8, 0, 0,
1875
1855
pbn_b2_8_460800 },
1856
+
{ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,
1857
+
PCI_SUBVENDOR_ID_EXSYS,
1858
+
PCI_SUBDEVICE_ID_EXSYS_4055, 0, 0,
1859
+
pbn_exsys_4055 },
1876
1860
/*
1877
1861
* Megawolf Romulus PCI Serial Card, from Mike Hudson
1878
1862
* (Exoray@isys.ca)
+2
include/linux/pci_ids.h
+2
include/linux/pci_ids.h
···
723
723
#define PCI_DEVICE_ID_HP_DIVA_EVEREST 0x1282
724
724
#define PCI_DEVICE_ID_HP_DIVA_AUX 0x1290
725
725
#define PCI_DEVICE_ID_HP_DIVA_RMP3 0x1301
726
+
#define PCI_DEVICE_ID_HP_DIVA_HURRICANE 0x132a
726
727
#define PCI_DEVICE_ID_HP_CISS 0x3210
727
728
#define PCI_DEVICE_ID_HP_CISSA 0x3220
728
729
#define PCI_DEVICE_ID_HP_CISSB 0x3222
···
2697
2696
2698
2697
#define PCI_SUBVENDOR_ID_EXSYS 0xd84d
2699
2698
#define PCI_SUBDEVICE_ID_EXSYS_4014 0x4014
2699
+
#define PCI_SUBDEVICE_ID_EXSYS_4055 0x4055
2700
2700
2701
2701
#define PCI_VENDOR_ID_TIGERJET 0xe159
2702
2702
#define PCI_DEVICE_ID_TIGERJET_300 0x0001