Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc88d5d4 authored by wendy xiong's avatar wendy xiong Committed by Linus Torvalds
Browse files

icom: add new sub-device-id to support new adapter 



This patch add new sub-device-id to support new adapter and changed the
interrupt irq number for unsigned char to unsigned int.

[akpm@osdl.org: fix whitespace in device table]
Signed-off by: Wendy Xiong <wendyx@us.ibm.com>

Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e40659c5

drivers/serial/icom.c

+31 −24
Original line number Original line Diff line number Diff line
@@ -96,6 +96,13 @@ static const struct pci_device_id icom_pci_table[] = { 
		.subdevice = PCI_DEVICE_ID_IBM_ICOM_FOUR_PORT_MODEL,

		.subdevice = PCI_DEVICE_ID_IBM_ICOM_FOUR_PORT_MODEL,

		.driver_data = ADAPTER_V2,

		.driver_data = ADAPTER_V2,

	},

	},

	{

		.vendor = PCI_VENDOR_ID_IBM,

		.device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2,

		.subvendor = PCI_VENDOR_ID_IBM,

		.subdevice = PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM_PCIE,

		.driver_data = ADAPTER_V2,

	},

	{}

	{}

};

};

include/linux/pci_ids.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -471,6 +471,7 @@ 
#define PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2	0x0219

#define PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2	0x0219

#define PCI_DEVICE_ID_IBM_ICOM_V2_TWO_PORTS_RVX		0x021A

#define PCI_DEVICE_ID_IBM_ICOM_V2_TWO_PORTS_RVX		0x021A

#define PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM	0x0251

#define PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM	0x0251

#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_DEVICE_ID_IBM_ICOM_FOUR_PORT_MODEL	0x252





#define PCI_VENDOR_ID_COMPEX2		0x101a /* pci.ids says "AT&T GIS (NCR)" */

#define PCI_VENDOR_ID_COMPEX2		0x101a /* pci.ids says "AT&T GIS (NCR)" */