Skip to content

Commit 5c41483

Browse files
Crescent CY Hsiehgregkh
Crescent CY Hsieh
authored and
gregkh
committed
tty: serial: 8250: Relocate macros within 8250_pci.c
Move PCI_DEVICE_ID macros to the top so that these macros can be used throughout 8250_pci.c Signed-off-by: Crescent CY Hsieh <[email protected]> Reviewed-by: Jiri Slaby <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 6ff3f33 commit 5c41483

File tree

1 file changed

+72
-72
lines changed

1 file changed

+72
-72
lines changed

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

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,78 @@
2626
#include "8250.h"
2727
#include "8250_pcilib.h"
2828

29+
#define PCI_VENDOR_ID_SBSMODULARIO 0x124B
30+
#define PCI_SUBVENDOR_ID_SBSMODULARIO 0x124B
31+
#define PCI_DEVICE_ID_OCTPRO 0x0001
32+
#define PCI_SUBDEVICE_ID_OCTPRO232 0x0108
33+
#define PCI_SUBDEVICE_ID_OCTPRO422 0x0208
34+
#define PCI_SUBDEVICE_ID_POCTAL232 0x0308
35+
#define PCI_SUBDEVICE_ID_POCTAL422 0x0408
36+
#define PCI_SUBDEVICE_ID_SIIG_DUAL_00 0x2500
37+
#define PCI_SUBDEVICE_ID_SIIG_DUAL_30 0x2530
38+
#define PCI_VENDOR_ID_ADVANTECH 0x13fe
39+
#define PCI_DEVICE_ID_INTEL_CE4100_UART 0x2e66
40+
#define PCI_DEVICE_ID_ADVANTECH_PCI1600 0x1600
41+
#define PCI_DEVICE_ID_ADVANTECH_PCI1600_1611 0x1611
42+
#define PCI_DEVICE_ID_ADVANTECH_PCI3620 0x3620
43+
#define PCI_DEVICE_ID_ADVANTECH_PCI3618 0x3618
44+
#define PCI_DEVICE_ID_ADVANTECH_PCIf618 0xf618
45+
#define PCI_DEVICE_ID_TITAN_200I 0x8028
46+
#define PCI_DEVICE_ID_TITAN_400I 0x8048
47+
#define PCI_DEVICE_ID_TITAN_800I 0x8088
48+
#define PCI_DEVICE_ID_TITAN_800EH 0xA007
49+
#define PCI_DEVICE_ID_TITAN_800EHB 0xA008
50+
#define PCI_DEVICE_ID_TITAN_400EH 0xA009
51+
#define PCI_DEVICE_ID_TITAN_100E 0xA010
52+
#define PCI_DEVICE_ID_TITAN_200E 0xA012
53+
#define PCI_DEVICE_ID_TITAN_400E 0xA013
54+
#define PCI_DEVICE_ID_TITAN_800E 0xA014
55+
#define PCI_DEVICE_ID_TITAN_200EI 0xA016
56+
#define PCI_DEVICE_ID_TITAN_200EISI 0xA017
57+
#define PCI_DEVICE_ID_TITAN_200V3 0xA306
58+
#define PCI_DEVICE_ID_TITAN_400V3 0xA310
59+
#define PCI_DEVICE_ID_TITAN_410V3 0xA312
60+
#define PCI_DEVICE_ID_TITAN_800V3 0xA314
61+
#define PCI_DEVICE_ID_TITAN_800V3B 0xA315
62+
#define PCI_DEVICE_ID_OXSEMI_16PCI958 0x9538
63+
#define PCIE_DEVICE_ID_NEO_2_OX_IBM 0x00F6
64+
#define PCI_DEVICE_ID_PLX_CRONYX_OMEGA 0xc001
65+
#define PCI_DEVICE_ID_INTEL_PATSBURG_KT 0x1d3d
66+
#define PCI_VENDOR_ID_WCH 0x4348
67+
#define PCI_DEVICE_ID_WCH_CH352_2S 0x3253
68+
#define PCI_DEVICE_ID_WCH_CH353_4S 0x3453
69+
#define PCI_DEVICE_ID_WCH_CH353_2S1PF 0x5046
70+
#define PCI_DEVICE_ID_WCH_CH353_1S1P 0x5053
71+
#define PCI_DEVICE_ID_WCH_CH353_2S1P 0x7053
72+
#define PCI_DEVICE_ID_WCH_CH355_4S 0x7173
73+
#define PCI_VENDOR_ID_AGESTAR 0x5372
74+
#define PCI_DEVICE_ID_AGESTAR_9375 0x6872
75+
#define PCI_DEVICE_ID_BROADCOM_TRUMANAGE 0x160a
76+
#define PCI_DEVICE_ID_AMCC_ADDIDATA_APCI7800 0x818e
77+
78+
#define PCIE_VENDOR_ID_WCH 0x1c00
79+
#define PCIE_DEVICE_ID_WCH_CH382_2S1P 0x3250
80+
#define PCIE_DEVICE_ID_WCH_CH384_4S 0x3470
81+
#define PCIE_DEVICE_ID_WCH_CH384_8S 0x3853
82+
#define PCIE_DEVICE_ID_WCH_CH382_2S 0x3253
83+
84+
#define PCI_DEVICE_ID_MOXA_CP102E 0x1024
85+
#define PCI_DEVICE_ID_MOXA_CP102EL 0x1025
86+
#define PCI_DEVICE_ID_MOXA_CP104EL_A 0x1045
87+
#define PCI_DEVICE_ID_MOXA_CP114EL 0x1144
88+
#define PCI_DEVICE_ID_MOXA_CP116E_A_A 0x1160
89+
#define PCI_DEVICE_ID_MOXA_CP116E_A_B 0x1161
90+
#define PCI_DEVICE_ID_MOXA_CP118EL_A 0x1182
91+
#define PCI_DEVICE_ID_MOXA_CP118E_A_I 0x1183
92+
#define PCI_DEVICE_ID_MOXA_CP132EL 0x1322
93+
#define PCI_DEVICE_ID_MOXA_CP134EL_A 0x1342
94+
#define PCI_DEVICE_ID_MOXA_CP138E_A 0x1381
95+
#define PCI_DEVICE_ID_MOXA_CP168EL_A 0x1683
96+
97+
/* Unknown vendors/cards - this should not be in linux/pci_ids.h */
98+
#define PCI_SUBDEVICE_ID_UNKNOWN_0x1584 0x1584
99+
#define PCI_SUBDEVICE_ID_UNKNOWN_0x1588 0x1588
100+
29101
/*
30102
* init function returns:
31103
* > 0 - number of ports
@@ -1903,78 +1975,6 @@ pci_moxa_setup(struct serial_private *priv,
19031975
return setup_port(priv, port, bar, offset, 0);
19041976
}
19051977

1906-
#define PCI_VENDOR_ID_SBSMODULARIO 0x124B
1907-
#define PCI_SUBVENDOR_ID_SBSMODULARIO 0x124B
1908-
#define PCI_DEVICE_ID_OCTPRO 0x0001
1909-
#define PCI_SUBDEVICE_ID_OCTPRO232 0x0108
1910-
#define PCI_SUBDEVICE_ID_OCTPRO422 0x0208
1911-
#define PCI_SUBDEVICE_ID_POCTAL232 0x0308
1912-
#define PCI_SUBDEVICE_ID_POCTAL422 0x0408
1913-
#define PCI_SUBDEVICE_ID_SIIG_DUAL_00 0x2500
1914-
#define PCI_SUBDEVICE_ID_SIIG_DUAL_30 0x2530
1915-
#define PCI_VENDOR_ID_ADVANTECH 0x13fe
1916-
#define PCI_DEVICE_ID_INTEL_CE4100_UART 0x2e66
1917-
#define PCI_DEVICE_ID_ADVANTECH_PCI1600 0x1600
1918-
#define PCI_DEVICE_ID_ADVANTECH_PCI1600_1611 0x1611
1919-
#define PCI_DEVICE_ID_ADVANTECH_PCI3620 0x3620
1920-
#define PCI_DEVICE_ID_ADVANTECH_PCI3618 0x3618
1921-
#define PCI_DEVICE_ID_ADVANTECH_PCIf618 0xf618
1922-
#define PCI_DEVICE_ID_TITAN_200I 0x8028
1923-
#define PCI_DEVICE_ID_TITAN_400I 0x8048
1924-
#define PCI_DEVICE_ID_TITAN_800I 0x8088
1925-
#define PCI_DEVICE_ID_TITAN_800EH 0xA007
1926-
#define PCI_DEVICE_ID_TITAN_800EHB 0xA008
1927-
#define PCI_DEVICE_ID_TITAN_400EH 0xA009
1928-
#define PCI_DEVICE_ID_TITAN_100E 0xA010
1929-
#define PCI_DEVICE_ID_TITAN_200E 0xA012
1930-
#define PCI_DEVICE_ID_TITAN_400E 0xA013
1931-
#define PCI_DEVICE_ID_TITAN_800E 0xA014
1932-
#define PCI_DEVICE_ID_TITAN_200EI 0xA016
1933-
#define PCI_DEVICE_ID_TITAN_200EISI 0xA017
1934-
#define PCI_DEVICE_ID_TITAN_200V3 0xA306
1935-
#define PCI_DEVICE_ID_TITAN_400V3 0xA310
1936-
#define PCI_DEVICE_ID_TITAN_410V3 0xA312
1937-
#define PCI_DEVICE_ID_TITAN_800V3 0xA314
1938-
#define PCI_DEVICE_ID_TITAN_800V3B 0xA315
1939-
#define PCI_DEVICE_ID_OXSEMI_16PCI958 0x9538
1940-
#define PCIE_DEVICE_ID_NEO_2_OX_IBM 0x00F6
1941-
#define PCI_DEVICE_ID_PLX_CRONYX_OMEGA 0xc001
1942-
#define PCI_DEVICE_ID_INTEL_PATSBURG_KT 0x1d3d
1943-
#define PCI_VENDOR_ID_WCH 0x4348
1944-
#define PCI_DEVICE_ID_WCH_CH352_2S 0x3253
1945-
#define PCI_DEVICE_ID_WCH_CH353_4S 0x3453
1946-
#define PCI_DEVICE_ID_WCH_CH353_2S1PF 0x5046
1947-
#define PCI_DEVICE_ID_WCH_CH353_1S1P 0x5053
1948-
#define PCI_DEVICE_ID_WCH_CH353_2S1P 0x7053
1949-
#define PCI_DEVICE_ID_WCH_CH355_4S 0x7173
1950-
#define PCI_VENDOR_ID_AGESTAR 0x5372
1951-
#define PCI_DEVICE_ID_AGESTAR_9375 0x6872
1952-
#define PCI_DEVICE_ID_BROADCOM_TRUMANAGE 0x160a
1953-
#define PCI_DEVICE_ID_AMCC_ADDIDATA_APCI7800 0x818e
1954-
1955-
#define PCIE_VENDOR_ID_WCH 0x1c00
1956-
#define PCIE_DEVICE_ID_WCH_CH382_2S1P 0x3250
1957-
#define PCIE_DEVICE_ID_WCH_CH384_4S 0x3470
1958-
#define PCIE_DEVICE_ID_WCH_CH384_8S 0x3853
1959-
#define PCIE_DEVICE_ID_WCH_CH382_2S 0x3253
1960-
1961-
#define PCI_DEVICE_ID_MOXA_CP102E 0x1024
1962-
#define PCI_DEVICE_ID_MOXA_CP102EL 0x1025
1963-
#define PCI_DEVICE_ID_MOXA_CP104EL_A 0x1045
1964-
#define PCI_DEVICE_ID_MOXA_CP114EL 0x1144
1965-
#define PCI_DEVICE_ID_MOXA_CP116E_A_A 0x1160
1966-
#define PCI_DEVICE_ID_MOXA_CP116E_A_B 0x1161
1967-
#define PCI_DEVICE_ID_MOXA_CP118EL_A 0x1182
1968-
#define PCI_DEVICE_ID_MOXA_CP118E_A_I 0x1183
1969-
#define PCI_DEVICE_ID_MOXA_CP132EL 0x1322
1970-
#define PCI_DEVICE_ID_MOXA_CP134EL_A 0x1342
1971-
#define PCI_DEVICE_ID_MOXA_CP138E_A 0x1381
1972-
#define PCI_DEVICE_ID_MOXA_CP168EL_A 0x1683
1973-
1974-
/* Unknown vendors/cards - this should not be in linux/pci_ids.h */
1975-
#define PCI_SUBDEVICE_ID_UNKNOWN_0x1584 0x1584
1976-
#define PCI_SUBDEVICE_ID_UNKNOWN_0x1588 0x1588
1977-
19781978
/*
19791979
* Master list of serial port init/setup/exit quirks.
19801980
* This does not describe the general nature of the port.

0 commit comments

Comments
 (0)