Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
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>
authored by wendy xiong and committed by Linus Torvalds bc88d5d4 e40659c5
+31
-24
drivers/serial/icom.c
+31
-24
drivers/serial/icom.c
···
69
69
70
70
static const struct pci_device_id icom_pci_table[] = {
71
71
{
72
-
.vendor = PCI_VENDOR_ID_IBM,
73
-
.device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_1,
74
-
.subvendor = PCI_ANY_ID,
75
-
.subdevice = PCI_ANY_ID,
76
-
.driver_data = ADAPTER_V1,
77
-
},
72
+
.vendor = PCI_VENDOR_ID_IBM,
73
+
.device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_1,
74
+
.subvendor = PCI_ANY_ID,
75
+
.subdevice = PCI_ANY_ID,
76
+
.driver_data = ADAPTER_V1,
77
+
},
78
78
{
79
-
.vendor = PCI_VENDOR_ID_IBM,
80
-
.device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2,
81
-
.subvendor = PCI_VENDOR_ID_IBM,
82
-
.subdevice = PCI_DEVICE_ID_IBM_ICOM_V2_TWO_PORTS_RVX,
83
-
.driver_data = ADAPTER_V2,
84
-
},
79
+
.vendor = PCI_VENDOR_ID_IBM,
80
+
.device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2,
81
+
.subvendor = PCI_VENDOR_ID_IBM,
82
+
.subdevice = PCI_DEVICE_ID_IBM_ICOM_V2_TWO_PORTS_RVX,
83
+
.driver_data = ADAPTER_V2,
84
+
},
85
85
{
86
-
.vendor = PCI_VENDOR_ID_IBM,
87
-
.device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2,
88
-
.subvendor = PCI_VENDOR_ID_IBM,
89
-
.subdevice = PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM,
90
-
.driver_data = ADAPTER_V2,
91
-
},
86
+
.vendor = PCI_VENDOR_ID_IBM,
87
+
.device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2,
88
+
.subvendor = PCI_VENDOR_ID_IBM,
89
+
.subdevice = PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM,
90
+
.driver_data = ADAPTER_V2,
91
+
},
92
92
{
93
-
.vendor = PCI_VENDOR_ID_IBM,
94
-
.device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2,
95
-
.subvendor = PCI_VENDOR_ID_IBM,
96
-
.subdevice = PCI_DEVICE_ID_IBM_ICOM_FOUR_PORT_MODEL,
97
-
.driver_data = ADAPTER_V2,
98
-
},
93
+
.vendor = PCI_VENDOR_ID_IBM,
94
+
.device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2,
95
+
.subvendor = PCI_VENDOR_ID_IBM,
96
+
.subdevice = PCI_DEVICE_ID_IBM_ICOM_FOUR_PORT_MODEL,
97
+
.driver_data = ADAPTER_V2,
98
+
},
99
+
{
100
+
.vendor = PCI_VENDOR_ID_IBM,
101
+
.device = PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2,
102
+
.subvendor = PCI_VENDOR_ID_IBM,
103
+
.subdevice = PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM_PCIE,
104
+
.driver_data = ADAPTER_V2,
105
+
},
99
106
{}
100
107
};
101
108
+1
include/linux/pci_ids.h
+1
include/linux/pci_ids.h
···
471
471
#define PCI_DEVICE_ID_IBM_ICOM_DEV_ID_2 0x0219
472
472
#define PCI_DEVICE_ID_IBM_ICOM_V2_TWO_PORTS_RVX 0x021A
473
473
#define PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM 0x0251
474
+
#define PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM_PCIE 0x0361
474
475
#define PCI_DEVICE_ID_IBM_ICOM_FOUR_PORT_MODEL 0x252
475
476
476
477
#define PCI_VENDOR_ID_COMPEX2 0x101a /* pci.ids says "AT&T GIS (NCR)" */