Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754633Ab1EKT2M (ORCPT ); Wed, 11 May 2011 15:28:12 -0400 Received: from mail200.messagelabs.com ([216.82.254.195]:10209 "EHLO mail200.messagelabs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752631Ab1EKT2K convert rfc822-to-8bit (ORCPT ); Wed, 11 May 2011 15:28:10 -0400 X-VirusChecked: Checked X-Env-Sender: Scott.Kilau@digi.com X-Msg-Ref: server-7.tower-200.messagelabs.com!1305142085!79956017!1 X-StarScan-Version: 6.2.16; banners=-,-,- X-Originating-IP: [66.77.174.13] From: "Kilau, Scott" To: "Kilau, Scott" , "'gregkh@suse.de'" CC: "'mreed10@us.ibm.com'" , "'linux-kernel@vger.kernel.org'" , "'Alan Cox'" Date: Wed, 11 May 2011 14:28:07 -0500 Subject: [PATCH] 8250_pci: Add support for the Digi/IBM PCIe 2-port Adapter Thread-Topic: [PATCH] 8250_pci: Add support for the Digi/IBM PCIe 2-port Adapter Thread-Index: AcwQDrmV+pdYJh3/SnaWwS6Gf9MhjwAAPefQ Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3254 Lines: 82 From: Scott Kilau Add support to the 8250 PCI serial driver for the Digi/IBM PCIe 2-port Async EIA-232 Adapter. Oxford Semiconductor produces a 2/4/8 port UART (OXPCIe952/OXPCIe954/OXPCIe958) chip called the Tornado, that can be used to create a very simple serial board product. The kernel sources currently have just 2 vendors using this chip, which is Oxford and Mainpipe. This new Digi/IBM serial product now uses it as well. Rather than create a long running comment of vendors using the chip, the one changed comment in the patch below now just lists "For Oxford Semiconductor Tornado based devices" to be a more generic comment for all vendors that end up using the Oxford Tornado chip. Patch was created against 2.6.38.6 Cc: Greg Kroah-Hartman Cc: Michael Reed Signed-off-by: Scott Kilau diff -uprN -X linux-2.6.38.6-vanilla/Documentation/dontdiff linux-2.6.38.6-vanilla/drivers/tty/serial/8250_pci.c linux-2.6.38.6/drivers/tty/serial/8250_pci.c --- linux-2.6.38.6-vanilla/drivers/tty/serial/8250_pci.c 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.6/drivers/tty/serial/8250_pci.c 2011-04-28 09:12:29.000000000 -0500 @@ -1412,7 +1412,7 @@ static struct pci_serial_quirk pci_seria .setup = pci_default_setup, }, /* - * For Oxford Semiconductor and Mainpine + * For Oxford Semiconductor Tornado based devices */ { .vendor = PCI_VENDOR_ID_OXSEMI, @@ -1430,6 +1430,14 @@ static struct pci_serial_quirk pci_seria .init = pci_oxsemi_tornado_init, .setup = pci_default_setup, }, + { + .vendor = PCI_VENDOR_ID_DIGI, + .device = PCIE_DEVICE_ID_NEO_2_OX_IBM, + .subvendor = PCI_SUBVENDOR_ID_IBM, + .subdevice = PCI_ANY_ID, + .init = pci_oxsemi_tornado_init, + .setup = pci_default_setup, + }, /* * Default "match everything" terminator entry */ @@ -3075,6 +3083,14 @@ static struct pci_device_id serial_pci_t { PCI_VENDOR_ID_MAINPINE, 0x4000, /* IQ Express 8 Port V.34 Super-G3 Fax */ PCI_VENDOR_ID_MAINPINE, 0x4008, 0, 0, pbn_oxsemi_8_4000000 }, + + /* + * Digi/IBM PCIe 2-port Async EIA-232 Adapter utilizing OxSemi Tornado + */ + { PCI_VENDOR_ID_DIGI, PCIE_DEVICE_ID_NEO_2_OX_IBM, + PCI_SUBVENDOR_ID_IBM, PCI_ANY_ID, 0, 0, + pbn_oxsemi_2_4000000 }, + /* * SBS Technologies, Inc. P-Octal and PMC-OCTPRO cards, * from skokodyn@yahoo.com diff -uprN -X linux-2.6.38.6-vanilla/Documentation/dontdiff linux-2.6.38.6-vanilla/include/linux/pci_ids.h linux-2.6.38.6/include/linux/pci_ids.h --- linux-2.6.38.6-vanilla/include/linux/pci_ids.h 2011-04-21 16:34:46.000000000 -0500 +++ linux-2.6.38.6/include/linux/pci_ids.h 2011-04-27 14:56:30.000000000 -0500 @@ -1476,6 +1476,7 @@ #define PCI_DEVICE_ID_NEO_2RJ45 0x00CA #define PCI_DEVICE_ID_NEO_2RJ45PRI 0x00CB #define PCIE_DEVICE_ID_NEO_4_IBM 0x00F4 +#define PCIE_DEVICE_ID_NEO_2_OX_IBM 0x00F6 #define PCI_VENDOR_ID_XIRCOM 0x115d #define PCI_DEVICE_ID_XIRCOM_RBM56G 0x0101 -- 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/