From linux-kernel-owner+willy=40w.ods.org@vger.kernel.org Sun Dec 15 18:45:28 2002 Return-Path: Received: from vax.home.local (vax [10.2.1.2]) by alpha.home.local (8.12.4/8.12.1) with ESMTP id gBFHjRPq031634 for ; Sun, 15 Dec 2002 18:45:27 +0100 Received: from vger.kernel.org (vger.kernel.org [209.116.70.75]) by vax.home.local (8.12.2/8.12.1) with ESMTP id gBFHhMti028630 for ; Sun, 15 Dec 2002 18:43:23 +0100 (CET) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id ; Sun, 15 Dec 2002 12:32:03 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id ; Sun, 15 Dec 2002 12:32:03 -0500 Received: from port48.ds1-vbr.adsl.cybercity.dk ([212.242.58.113]:18002 "EHLO brian.localnet") by vger.kernel.org with ESMTP id ; Sun, 15 Dec 2002 12:32:01 -0500 Received: from brm by brian.localnet with local (Exim 3.35 #1 (Debian)) id 18Ncjo-000152-00; Sun, 15 Dec 2002 18:39:36 +0100 To: alan@redhat.com, linus@transmeta.com Subject: [PATCH 2.4] Titan pci serial card recognition fix Cc: linux-kernel@vger.kernel.org Message-Id: From: Brian Murphy Date: Sun, 15 Dec 2002 18:39:36 +0100 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org Status: RO Content-Length: 2946 Lines: 90 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 --- linux/drivers/char/serial.c 2002-12-15 18:21:15.000000000 +0100 +++ linux/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, - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/