[git] batman-adv branch, linux, updated. 31791c214a69092cb9feb5a6198a695a21fa0b24 - commits - lists.open-mesh.org

9 Nov 2009

The following commit has been merged in the linux branch:
commit c68d2b1594548cda7f6dbac6a4d9d30a9b01558c
Author: Benjamin Herrenschmidt benh@kernel.crashing.org
Date:   Mon Oct 26 16:50:05 2009 -0700
8250_pci: add IBM Saturn serial card
The IBM Saturn serial card has only one port. Without that fixup,
    the kernel thinks it has two, which confuses userland setup and
    admin tools as well.
[akpm@linux-foundation.org: fix pci-ids.h layout]
    Signed-off-by: Benjamin Herrenschmidt benh@kernel.crashing.org
    Acked-by: Alan Cox alan@linux.intel.com
    Cc: Michael Reed mreed10@us.ibm.com
    Cc: stable@kernel.org
    Signed-off-by: Andrew Morton akpm@linux-foundation.org
    Signed-off-by: Linus Torvalds torvalds@linux-foundation.org

diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index 3294693..42e8550 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -1561,6 +1561,7 @@ enum pci_board_num_t {
    pbn_exar_XR17C152,
    pbn_exar_XR17C154,
    pbn_exar_XR17C158,
+	pbn_exar_ibm_saturn,
    pbn_pasemi_1682M,
    pbn_ni8430_2,
    pbn_ni8430_4,
@@ -2150,6 +2151,13 @@ static struct pciserial_board pci_boards[] __devinitdata = {
    	.base_baud	= 921600,
    	.uart_offset	= 0x200,
    },
+	[pbn_exar_ibm_saturn] = {
+		.flags		= FL_BASE0,
+		.num_ports	= 1,
+		.base_baud	= 921600,
+		.uart_offset	= 0x200,
+	},
+
    /*
     * PA Semi PWRficient PA6T-1682M on-chip UART
     */
@@ -2684,6 +2692,9 @@ static struct pci_device_id serial_pci_tbl[] = {
    	PCI_SUBVENDOR_ID_CONNECT_TECH,
    	PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_8_485, 0, 0,
    	pbn_b0_8_1843200_200 },
+	{	PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17C152,
+		PCI_VENDOR_ID_IBM, PCI_SUBDEVICE_ID_IBM_SATURN_SERIAL_ONE_PORT,
+		0, 0, pbn_exar_ibm_saturn },
{	PCI_VENDOR_ID_SEALEVEL, PCI_DEVICE_ID_SEALEVEL_U530,
    	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index df48628..b0f0f38 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -482,6 +482,9 @@
 #define PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM_PCIE 0x0361
 #define PCI_DEVICE_ID_IBM_ICOM_FOUR_PORT_MODEL	0x252
+#define PCI_SUBVENDOR_ID_IBM		0x1014
+#define PCI_SUBDEVICE_ID_IBM_SATURN_SERIAL_ONE_PORT	0x03d4
+
 #define PCI_VENDOR_ID_UNISYS		0x1018
 #define PCI_DEVICE_ID_UNISYS_DMA_DIRECTOR 0x001C
-- 
batman-adv

    