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: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Родитель
e40659c5ca
Коммит
bc88d5d4e1
|
@ -69,33 +69,40 @@
|
|||
|
||||
static const struct pci_device_id icom_pci_table[] = {
|
||||
{
|
||||
.vendor = PCI_VENDOR_ID_IBM,
|
||||
.device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_1,
|
||||
.subvendor = PCI_ANY_ID,
|
||||
.subdevice = PCI_ANY_ID,
|
||||
.driver_data = ADAPTER_V1,
|
||||
},
|
||||
.vendor = PCI_VENDOR_ID_IBM,
|
||||
.device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_1,
|
||||
.subvendor = PCI_ANY_ID,
|
||||
.subdevice = PCI_ANY_ID,
|
||||
.driver_data = ADAPTER_V1,
|
||||
},
|
||||
{
|
||||
.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_TWO_PORTS_RVX,
|
||||
.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_TWO_PORTS_RVX,
|
||||
.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,
|
||||
.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,
|
||||
.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_FOUR_PORT_MODEL,
|
||||
.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_FOUR_PORT_MODEL,
|
||||
.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,
|
||||
},
|
||||
{}
|
||||
};
|
||||
|
||||
|
|
|
@ -471,6 +471,7 @@
|
|||
#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_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_VENDOR_ID_COMPEX2 0x101a /* pci.ids says "AT&T GIS (NCR)" */
|
||||
|
|
Загрузка…
Ссылка в новой задаче