2002-12-15 17:32:03

by Brian Murphy

[permalink] [raw]
Subject: [PATCH 2.4] Titan pci serial card recognition fix

This patch fixes an error in the pci recognition table which
means that otherwise supportes Titan pci serial cards fail to
work.

This is the same as I just posted for the 2.5 kernel.

/Brian

--- drivers/char/serial.c 2002-12-15 18:21:15.000000000 +0100
+++ drivers/char/serial.c 2002-12-15 17:00:41.000000000 +0100
@@ -473,6 +473,7 @@
pbn_b1_4_115200,
pbn_b1_8_115200,

+ pbn_b1_1_921600,
pbn_b1_2_921600,
pbn_b1_4_921600,
pbn_b1_8_921600,
@@ -481,6 +482,8 @@
pbn_b1_4_1382400,
pbn_b1_8_1382400,

+ pbn_b1_bt_2_921600,
+
pbn_b2_1_115200,
pbn_b2_8_115200,
pbn_b2_4_460800,
@@ -494,6 +497,9 @@
pbn_b2_bt_4_115200,
pbn_b2_bt_2_921600,

+ pbn_bt_4_921600,
+ pbn_bt_8_921600,
+
pbn_panacom,
pbn_panacom2,
pbn_panacom4,
@@ -553,6 +559,7 @@
{ SPCI_FL_BASE1, 4, 115200 }, /* pbn_b1_4_115200 */
{ SPCI_FL_BASE1, 8, 115200 }, /* pbn_b1_8_115200 */

+ { SPCI_FL_BASE1, 1, 921600 }, /* pbn_b1_1_921600 */
{ SPCI_FL_BASE1, 2, 921600 }, /* pbn_b1_2_921600 */
{ SPCI_FL_BASE1, 4, 921600 }, /* pbn_b1_4_921600 */
{ SPCI_FL_BASE1, 8, 921600 }, /* pbn_b1_8_921600 */
@@ -561,6 +568,7 @@
{ SPCI_FL_BASE1, 4, 1382400 }, /* pbn_b1_4_1382400 */
{ SPCI_FL_BASE1, 8, 1382400 }, /* pbn_b1_8_1382400 */

+ { SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 2, 921600 }, /* pbn_b1_bt_2_921600 */
{ SPCI_FL_BASE2, 1, 115200 }, /* pbn_b2_1_115200 */
{ SPCI_FL_BASE2, 8, 115200 }, /* pbn_b2_8_115200 */
{ SPCI_FL_BASE2, 4, 460800 }, /* pbn_b2_4_460800 */
@@ -574,6 +582,9 @@
{ SPCI_FL_BASE2 | SPCI_FL_BASE_TABLE, 4, 115200 }, /* pbn_b2_bt_4_115200 */
{ SPCI_FL_BASE2 | SPCI_FL_BASE_TABLE, 2, 921600 }, /* pbn_b2_bt_2_921600 */

+ { SPCI_FL_BASE_TABLE, 4, 921600 }, /* pbn_bt_4_921600 */
+ { SPCI_FL_BASE_TABLE, 8, 921600 }, /* pbn_bt_8_921600 */
+
{ SPCI_FL_BASE2, 2, 921600, /* IOMEM */ /* pbn_panacom */
0x400, 7, pci_plx9050_fn },
{ SPCI_FL_BASE2 | SPCI_FL_BASE_TABLE, 2, 921600, /* pbn_panacom2 */
@@ -1000,17 +1011,17 @@
pbn_b0_4_921600 },
{ PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_100L,
PCI_ANY_ID, PCI_ANY_ID,
- SPCI_FL_BASE1, 1, 921600 },
+ pbn_b1_1_921600 },
{ PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_200L,
PCI_ANY_ID, PCI_ANY_ID,
- SPCI_FL_BASE1 | SPCI_FL_BASE_TABLE, 2, 921600 },
+ pbn_b1_bt_2_921600 },
/* The 400L and 800L have a custom hack in get_pci_port */
{ PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_400L,
PCI_ANY_ID, PCI_ANY_ID,
- SPCI_FL_BASE_TABLE, 4, 921600 },
+ pbn_bt_4_921600 },
{ PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_800L,
PCI_ANY_ID, PCI_ANY_ID,
- SPCI_FL_BASE_TABLE, 8, 921600 },
+ pbn_bt_8_921600 },

{ PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S_10x_550,
PCI_ANY_ID, PCI_ANY_ID, 0, 0,