Skip to content

Commit 50c9b14

Browse files
andy-shevmehmetb0
andy-shev
authored and
mehmetb0
committed
serial: 8250_pci: Resolve WCH vendor ID ambiguity
BugLink: https://bugs.launchpad.net/bugs/2104873 [ Upstream commit 16076ca ] There are two sites of the same brand: wch.cn and wch-ic.com. They are property of the same company, but it appears that they managed to get two different PCI vendor IDs. Rename them accordingly using standard pattern, i.e. PCI_VENDOR_ID_... While at it, move to PCI_VDEVICE() in the ID tables. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: https://lore.kernel.org/r/20241204031114.1029882-2-andriy.shevchenko@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Noah Wager <noah.wager@canonical.com>
1 parent 11578b8 commit 50c9b14

File tree

1 file changed

+41
-41
lines changed

1 file changed

+41
-41
lines changed

‎drivers/tty/serial/8250/8250_pci.c

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -64,23 +64,23 @@
6464
#define PCIE_DEVICE_ID_NEO_2_OX_IBM 0x00F6
6565
#define PCI_DEVICE_ID_PLX_CRONYX_OMEGA 0xc001
6666
#define PCI_DEVICE_ID_INTEL_PATSBURG_KT 0x1d3d
67-
#define PCI_VENDOR_ID_WCH 0x4348
68-
#define PCI_DEVICE_ID_WCH_CH352_2S 0x3253
69-
#define PCI_DEVICE_ID_WCH_CH353_4S 0x3453
70-
#define PCI_DEVICE_ID_WCH_CH353_2S1PF 0x5046
71-
#define PCI_DEVICE_ID_WCH_CH353_1S1P 0x5053
72-
#define PCI_DEVICE_ID_WCH_CH353_2S1P 0x7053
73-
#define PCI_DEVICE_ID_WCH_CH355_4S 0x7173
67+
#define PCI_VENDOR_ID_WCHCN 0x4348
68+
#define PCI_DEVICE_ID_WCHCN_CH352_2S 0x3253
69+
#define PCI_DEVICE_ID_WCHCN_CH353_4S 0x3453
70+
#define PCI_DEVICE_ID_WCHCN_CH353_2S1PF 0x5046
71+
#define PCI_DEVICE_ID_WCHCN_CH353_1S1P 0x5053
72+
#define PCI_DEVICE_ID_WCHCN_CH353_2S1P 0x7053
73+
#define PCI_DEVICE_ID_WCHCN_CH355_4S 0x7173
7474
#define PCI_VENDOR_ID_AGESTAR 0x5372
7575
#define PCI_DEVICE_ID_AGESTAR_9375 0x6872
7676
#define PCI_DEVICE_ID_BROADCOM_TRUMANAGE 0x160a
7777
#define PCI_DEVICE_ID_AMCC_ADDIDATA_APCI7800 0x818e
7878

79-
#define PCIE_VENDOR_ID_WCH 0x1c00
80-
#define PCIE_DEVICE_ID_WCH_CH382_2S1P 0x3250
81-
#define PCIE_DEVICE_ID_WCH_CH384_4S 0x3470
82-
#define PCIE_DEVICE_ID_WCH_CH384_8S 0x3853
83-
#define PCIE_DEVICE_ID_WCH_CH382_2S 0x3253
79+
#define PCI_VENDOR_ID_WCHIC 0x1c00
80+
#define PCI_DEVICE_ID_WCHIC_CH382_2S1P 0x3250
81+
#define PCI_DEVICE_ID_WCHIC_CH384_4S 0x3470
82+
#define PCI_DEVICE_ID_WCHIC_CH384_8S 0x3853
83+
#define PCI_DEVICE_ID_WCHIC_CH382_2S 0x3253
8484

8585
#define PCI_DEVICE_ID_MOXA_CP102E 0x1024
8686
#define PCI_DEVICE_ID_MOXA_CP102EL 0x1025
@@ -2777,80 +2777,80 @@ static struct pci_serial_quirk pci_serial_quirks[] = {
27772777
},
27782778
/* WCH CH353 1S1P card (16550 clone) */
27792779
{
2780-
.vendor = PCI_VENDOR_ID_WCH,
2781-
.device = PCI_DEVICE_ID_WCH_CH353_1S1P,
2780+
.vendor = PCI_VENDOR_ID_WCHCN,
2781+
.device = PCI_DEVICE_ID_WCHCN_CH353_1S1P,
27822782
.subvendor = PCI_ANY_ID,
27832783
.subdevice = PCI_ANY_ID,
27842784
.setup = pci_wch_ch353_setup,
27852785
},
27862786
/* WCH CH353 2S1P card (16550 clone) */
27872787
{
2788-
.vendor = PCI_VENDOR_ID_WCH,
2789-
.device = PCI_DEVICE_ID_WCH_CH353_2S1P,
2788+
.vendor = PCI_VENDOR_ID_WCHCN,
2789+
.device = PCI_DEVICE_ID_WCHCN_CH353_2S1P,
27902790
.subvendor = PCI_ANY_ID,
27912791
.subdevice = PCI_ANY_ID,
27922792
.setup = pci_wch_ch353_setup,
27932793
},
27942794
/* WCH CH353 4S card (16550 clone) */
27952795
{
2796-
.vendor = PCI_VENDOR_ID_WCH,
2797-
.device = PCI_DEVICE_ID_WCH_CH353_4S,
2796+
.vendor = PCI_VENDOR_ID_WCHCN,
2797+
.device = PCI_DEVICE_ID_WCHCN_CH353_4S,
27982798
.subvendor = PCI_ANY_ID,
27992799
.subdevice = PCI_ANY_ID,
28002800
.setup = pci_wch_ch353_setup,
28012801
},
28022802
/* WCH CH353 2S1PF card (16550 clone) */
28032803
{
2804-
.vendor = PCI_VENDOR_ID_WCH,
2805-
.device = PCI_DEVICE_ID_WCH_CH353_2S1PF,
2804+
.vendor = PCI_VENDOR_ID_WCHCN,
2805+
.device = PCI_DEVICE_ID_WCHCN_CH353_2S1PF,
28062806
.subvendor = PCI_ANY_ID,
28072807
.subdevice = PCI_ANY_ID,
28082808
.setup = pci_wch_ch353_setup,
28092809
},
28102810
/* WCH CH352 2S card (16550 clone) */
28112811
{
2812-
.vendor = PCI_VENDOR_ID_WCH,
2813-
.device = PCI_DEVICE_ID_WCH_CH352_2S,
2812+
.vendor = PCI_VENDOR_ID_WCHCN,
2813+
.device = PCI_DEVICE_ID_WCHCN_CH352_2S,
28142814
.subvendor = PCI_ANY_ID,
28152815
.subdevice = PCI_ANY_ID,
28162816
.setup = pci_wch_ch353_setup,
28172817
},
28182818
/* WCH CH355 4S card (16550 clone) */
28192819
{
2820-
.vendor = PCI_VENDOR_ID_WCH,
2821-
.device = PCI_DEVICE_ID_WCH_CH355_4S,
2820+
.vendor = PCI_VENDOR_ID_WCHCN,
2821+
.device = PCI_DEVICE_ID_WCHCN_CH355_4S,
28222822
.subvendor = PCI_ANY_ID,
28232823
.subdevice = PCI_ANY_ID,
28242824
.setup = pci_wch_ch355_setup,
28252825
},
28262826
/* WCH CH382 2S card (16850 clone) */
28272827
{
2828-
.vendor = PCIE_VENDOR_ID_WCH,
2829-
.device = PCIE_DEVICE_ID_WCH_CH382_2S,
2828+
.vendor = PCI_VENDOR_ID_WCHIC,
2829+
.device = PCI_DEVICE_ID_WCHIC_CH382_2S,
28302830
.subvendor = PCI_ANY_ID,
28312831
.subdevice = PCI_ANY_ID,
28322832
.setup = pci_wch_ch38x_setup,
28332833
},
28342834
/* WCH CH382 2S1P card (16850 clone) */
28352835
{
2836-
.vendor = PCIE_VENDOR_ID_WCH,
2837-
.device = PCIE_DEVICE_ID_WCH_CH382_2S1P,
2836+
.vendor = PCI_VENDOR_ID_WCHIC,
2837+
.device = PCI_DEVICE_ID_WCHIC_CH382_2S1P,
28382838
.subvendor = PCI_ANY_ID,
28392839
.subdevice = PCI_ANY_ID,
28402840
.setup = pci_wch_ch38x_setup,
28412841
},
28422842
/* WCH CH384 4S card (16850 clone) */
28432843
{
2844-
.vendor = PCIE_VENDOR_ID_WCH,
2845-
.device = PCIE_DEVICE_ID_WCH_CH384_4S,
2844+
.vendor = PCI_VENDOR_ID_WCHIC,
2845+
.device = PCI_DEVICE_ID_WCHIC_CH384_4S,
28462846
.subvendor = PCI_ANY_ID,
28472847
.subdevice = PCI_ANY_ID,
28482848
.setup = pci_wch_ch38x_setup,
28492849
},
28502850
/* WCH CH384 8S card (16850 clone) */
28512851
{
2852-
.vendor = PCIE_VENDOR_ID_WCH,
2853-
.device = PCIE_DEVICE_ID_WCH_CH384_8S,
2852+
.vendor = PCI_VENDOR_ID_WCHIC,
2853+
.device = PCI_DEVICE_ID_WCHIC_CH384_8S,
28542854
.subvendor = PCI_ANY_ID,
28552855
.subdevice = PCI_ANY_ID,
28562856
.init = pci_wch_ch38x_init,
@@ -3927,11 +3927,11 @@ static const struct pci_device_id blacklist[] = {
39273927

39283928
/* multi-io cards handled by parport_serial */
39293929
/* WCH CH353 2S1P */
3930-
{ PCI_DEVICE(0x4348, 0x7053), 0, 0, REPORT_CONFIG(PARPORT_SERIAL), },
3930+
{ PCI_VDEVICE(WCHCN, 0x7053), REPORT_CONFIG(PARPORT_SERIAL), },
39313931
/* WCH CH353 1S1P */
3932-
{ PCI_DEVICE(0x4348, 0x5053), 0, 0, REPORT_CONFIG(PARPORT_SERIAL), },
3932+
{ PCI_VDEVICE(WCHCN, 0x5053), REPORT_CONFIG(PARPORT_SERIAL), },
39333933
/* WCH CH382 2S1P */
3934-
{ PCI_DEVICE(0x1c00, 0x3250), 0, 0, REPORT_CONFIG(PARPORT_SERIAL), },
3934+
{ PCI_VDEVICE(WCHIC, 0x3250), REPORT_CONFIG(PARPORT_SERIAL), },
39353935

39363936
/* Intel platforms with MID UART */
39373937
{ PCI_VDEVICE(INTEL, 0x081b), REPORT_8250_CONFIG(MID), },
@@ -6004,27 +6004,27 @@ static const struct pci_device_id serial_pci_tbl[] = {
60046004
* WCH CH353 series devices: The 2S1P is handled by parport_serial
60056005
* so not listed here.
60066006
*/
6007-
{ PCI_VENDOR_ID_WCH, PCI_DEVICE_ID_WCH_CH353_4S,
6007+
{ PCI_VENDOR_ID_WCHCN, PCI_DEVICE_ID_WCHCN_CH353_4S,
60086008
PCI_ANY_ID, PCI_ANY_ID,
60096009
0, 0, pbn_b0_bt_4_115200 },
60106010

6011-
{ PCI_VENDOR_ID_WCH, PCI_DEVICE_ID_WCH_CH353_2S1PF,
6011+
{ PCI_VENDOR_ID_WCHCN, PCI_DEVICE_ID_WCHCN_CH353_2S1PF,
60126012
PCI_ANY_ID, PCI_ANY_ID,
60136013
0, 0, pbn_b0_bt_2_115200 },
60146014

6015-
{ PCI_VENDOR_ID_WCH, PCI_DEVICE_ID_WCH_CH355_4S,
6015+
{ PCI_VENDOR_ID_WCHCN, PCI_DEVICE_ID_WCHCN_CH355_4S,
60166016
PCI_ANY_ID, PCI_ANY_ID,
60176017
0, 0, pbn_b0_bt_4_115200 },
60186018

6019-
{ PCIE_VENDOR_ID_WCH, PCIE_DEVICE_ID_WCH_CH382_2S,
6019+
{ PCI_VENDOR_ID_WCHIC, PCI_DEVICE_ID_WCHIC_CH382_2S,
60206020
PCI_ANY_ID, PCI_ANY_ID,
60216021
0, 0, pbn_wch382_2 },
60226022

6023-
{ PCIE_VENDOR_ID_WCH, PCIE_DEVICE_ID_WCH_CH384_4S,
6023+
{ PCI_VENDOR_ID_WCHIC, PCI_DEVICE_ID_WCHIC_CH384_4S,
60246024
PCI_ANY_ID, PCI_ANY_ID,
60256025
0, 0, pbn_wch384_4 },
60266026

6027-
{ PCIE_VENDOR_ID_WCH, PCIE_DEVICE_ID_WCH_CH384_8S,
6027+
{ PCI_VENDOR_ID_WCHIC, PCI_DEVICE_ID_WCHIC_CH384_8S,
60286028
PCI_ANY_ID, PCI_ANY_ID,
60296029
0, 0, pbn_wch384_8 },
60306030
/*

0 commit comments

Comments
 (0)