Commit 5c414835 authored by Crescent CY Hsieh's avatar Crescent CY Hsieh Committed by Greg Kroah-Hartman
Browse files

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: default avatarCrescent CY Hsieh <crescentcy.hsieh@moxa.com>
Reviewed-by: default avatarJiri Slaby <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20231018091739.10125-4-crescentcy.hsieh@moxa.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6ff3f33b

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

+72 −72
Original line number Diff line number Diff line
@@ -26,6 +26,78 @@ 
#include "8250.h"

#include "8250_pcilib.h"



#define PCI_VENDOR_ID_SBSMODULARIO	0x124B

#define PCI_SUBVENDOR_ID_SBSMODULARIO	0x124B

#define PCI_DEVICE_ID_OCTPRO		0x0001

#define PCI_SUBDEVICE_ID_OCTPRO232	0x0108

#define PCI_SUBDEVICE_ID_OCTPRO422	0x0208

#define PCI_SUBDEVICE_ID_POCTAL232	0x0308

#define PCI_SUBDEVICE_ID_POCTAL422	0x0408

#define PCI_SUBDEVICE_ID_SIIG_DUAL_00	0x2500

#define PCI_SUBDEVICE_ID_SIIG_DUAL_30	0x2530

#define PCI_VENDOR_ID_ADVANTECH		0x13fe

#define PCI_DEVICE_ID_INTEL_CE4100_UART 0x2e66

#define PCI_DEVICE_ID_ADVANTECH_PCI1600	0x1600

#define PCI_DEVICE_ID_ADVANTECH_PCI1600_1611	0x1611

#define PCI_DEVICE_ID_ADVANTECH_PCI3620	0x3620

#define PCI_DEVICE_ID_ADVANTECH_PCI3618	0x3618

#define PCI_DEVICE_ID_ADVANTECH_PCIf618	0xf618

#define PCI_DEVICE_ID_TITAN_200I	0x8028

#define PCI_DEVICE_ID_TITAN_400I	0x8048

#define PCI_DEVICE_ID_TITAN_800I	0x8088

#define PCI_DEVICE_ID_TITAN_800EH	0xA007

#define PCI_DEVICE_ID_TITAN_800EHB	0xA008

#define PCI_DEVICE_ID_TITAN_400EH	0xA009

#define PCI_DEVICE_ID_TITAN_100E	0xA010

#define PCI_DEVICE_ID_TITAN_200E	0xA012

#define PCI_DEVICE_ID_TITAN_400E	0xA013

#define PCI_DEVICE_ID_TITAN_800E	0xA014

#define PCI_DEVICE_ID_TITAN_200EI	0xA016

#define PCI_DEVICE_ID_TITAN_200EISI	0xA017

#define PCI_DEVICE_ID_TITAN_200V3	0xA306

#define PCI_DEVICE_ID_TITAN_400V3	0xA310

#define PCI_DEVICE_ID_TITAN_410V3	0xA312

#define PCI_DEVICE_ID_TITAN_800V3	0xA314

#define PCI_DEVICE_ID_TITAN_800V3B	0xA315

#define PCI_DEVICE_ID_OXSEMI_16PCI958	0x9538

#define PCIE_DEVICE_ID_NEO_2_OX_IBM	0x00F6

#define PCI_DEVICE_ID_PLX_CRONYX_OMEGA	0xc001

#define PCI_DEVICE_ID_INTEL_PATSBURG_KT 0x1d3d

#define PCI_VENDOR_ID_WCH		0x4348

#define PCI_DEVICE_ID_WCH_CH352_2S	0x3253

#define PCI_DEVICE_ID_WCH_CH353_4S	0x3453

#define PCI_DEVICE_ID_WCH_CH353_2S1PF	0x5046

#define PCI_DEVICE_ID_WCH_CH353_1S1P	0x5053

#define PCI_DEVICE_ID_WCH_CH353_2S1P	0x7053

#define PCI_DEVICE_ID_WCH_CH355_4S	0x7173

#define PCI_VENDOR_ID_AGESTAR		0x5372

#define PCI_DEVICE_ID_AGESTAR_9375	0x6872

#define PCI_DEVICE_ID_BROADCOM_TRUMANAGE 0x160a

#define PCI_DEVICE_ID_AMCC_ADDIDATA_APCI7800 0x818e



#define PCIE_VENDOR_ID_WCH		0x1c00

#define PCIE_DEVICE_ID_WCH_CH382_2S1P	0x3250

#define PCIE_DEVICE_ID_WCH_CH384_4S	0x3470

#define PCIE_DEVICE_ID_WCH_CH384_8S	0x3853

#define PCIE_DEVICE_ID_WCH_CH382_2S	0x3253



#define PCI_DEVICE_ID_MOXA_CP102E	0x1024

#define PCI_DEVICE_ID_MOXA_CP102EL	0x1025

#define PCI_DEVICE_ID_MOXA_CP104EL_A	0x1045

#define PCI_DEVICE_ID_MOXA_CP114EL	0x1144

#define PCI_DEVICE_ID_MOXA_CP116E_A_A	0x1160

#define PCI_DEVICE_ID_MOXA_CP116E_A_B	0x1161

#define PCI_DEVICE_ID_MOXA_CP118EL_A	0x1182

#define PCI_DEVICE_ID_MOXA_CP118E_A_I	0x1183

#define PCI_DEVICE_ID_MOXA_CP132EL	0x1322

#define PCI_DEVICE_ID_MOXA_CP134EL_A	0x1342

#define PCI_DEVICE_ID_MOXA_CP138E_A	0x1381

#define PCI_DEVICE_ID_MOXA_CP168EL_A	0x1683



/* Unknown vendors/cards - this should not be in linux/pci_ids.h */

#define PCI_SUBDEVICE_ID_UNKNOWN_0x1584	0x1584

#define PCI_SUBDEVICE_ID_UNKNOWN_0x1588	0x1588



/*

 * init function returns:

 *  > 0 - number of ports
@@ -1903,78 +1975,6 @@ pci_moxa_setup(struct serial_private *priv, 
	return setup_port(priv, port, bar, offset, 0);

}



#define PCI_VENDOR_ID_SBSMODULARIO	0x124B

#define PCI_SUBVENDOR_ID_SBSMODULARIO	0x124B

#define PCI_DEVICE_ID_OCTPRO		0x0001

#define PCI_SUBDEVICE_ID_OCTPRO232	0x0108

#define PCI_SUBDEVICE_ID_OCTPRO422	0x0208

#define PCI_SUBDEVICE_ID_POCTAL232	0x0308

#define PCI_SUBDEVICE_ID_POCTAL422	0x0408

#define PCI_SUBDEVICE_ID_SIIG_DUAL_00	0x2500

#define PCI_SUBDEVICE_ID_SIIG_DUAL_30	0x2530

#define PCI_VENDOR_ID_ADVANTECH		0x13fe

#define PCI_DEVICE_ID_INTEL_CE4100_UART 0x2e66

#define PCI_DEVICE_ID_ADVANTECH_PCI1600	0x1600

#define PCI_DEVICE_ID_ADVANTECH_PCI1600_1611	0x1611

#define PCI_DEVICE_ID_ADVANTECH_PCI3620	0x3620

#define PCI_DEVICE_ID_ADVANTECH_PCI3618	0x3618

#define PCI_DEVICE_ID_ADVANTECH_PCIf618	0xf618

#define PCI_DEVICE_ID_TITAN_200I	0x8028

#define PCI_DEVICE_ID_TITAN_400I	0x8048

#define PCI_DEVICE_ID_TITAN_800I	0x8088

#define PCI_DEVICE_ID_TITAN_800EH	0xA007

#define PCI_DEVICE_ID_TITAN_800EHB	0xA008

#define PCI_DEVICE_ID_TITAN_400EH	0xA009

#define PCI_DEVICE_ID_TITAN_100E	0xA010

#define PCI_DEVICE_ID_TITAN_200E	0xA012

#define PCI_DEVICE_ID_TITAN_400E	0xA013

#define PCI_DEVICE_ID_TITAN_800E	0xA014

#define PCI_DEVICE_ID_TITAN_200EI	0xA016

#define PCI_DEVICE_ID_TITAN_200EISI	0xA017

#define PCI_DEVICE_ID_TITAN_200V3	0xA306

#define PCI_DEVICE_ID_TITAN_400V3	0xA310

#define PCI_DEVICE_ID_TITAN_410V3	0xA312

#define PCI_DEVICE_ID_TITAN_800V3	0xA314

#define PCI_DEVICE_ID_TITAN_800V3B	0xA315

#define PCI_DEVICE_ID_OXSEMI_16PCI958	0x9538

#define PCIE_DEVICE_ID_NEO_2_OX_IBM	0x00F6

#define PCI_DEVICE_ID_PLX_CRONYX_OMEGA	0xc001

#define PCI_DEVICE_ID_INTEL_PATSBURG_KT 0x1d3d

#define PCI_VENDOR_ID_WCH		0x4348

#define PCI_DEVICE_ID_WCH_CH352_2S	0x3253

#define PCI_DEVICE_ID_WCH_CH353_4S	0x3453

#define PCI_DEVICE_ID_WCH_CH353_2S1PF	0x5046

#define PCI_DEVICE_ID_WCH_CH353_1S1P	0x5053

#define PCI_DEVICE_ID_WCH_CH353_2S1P	0x7053

#define PCI_DEVICE_ID_WCH_CH355_4S	0x7173

#define PCI_VENDOR_ID_AGESTAR		0x5372

#define PCI_DEVICE_ID_AGESTAR_9375	0x6872

#define PCI_DEVICE_ID_BROADCOM_TRUMANAGE 0x160a

#define PCI_DEVICE_ID_AMCC_ADDIDATA_APCI7800 0x818e



#define PCIE_VENDOR_ID_WCH		0x1c00

#define PCIE_DEVICE_ID_WCH_CH382_2S1P	0x3250

#define PCIE_DEVICE_ID_WCH_CH384_4S	0x3470

#define PCIE_DEVICE_ID_WCH_CH384_8S	0x3853

#define PCIE_DEVICE_ID_WCH_CH382_2S	0x3253



#define	PCI_DEVICE_ID_MOXA_CP102E	0x1024

#define	PCI_DEVICE_ID_MOXA_CP102EL	0x1025

#define	PCI_DEVICE_ID_MOXA_CP104EL_A	0x1045

#define	PCI_DEVICE_ID_MOXA_CP114EL	0x1144

#define	PCI_DEVICE_ID_MOXA_CP116E_A_A	0x1160

#define	PCI_DEVICE_ID_MOXA_CP116E_A_B	0x1161

#define	PCI_DEVICE_ID_MOXA_CP118EL_A	0x1182

#define	PCI_DEVICE_ID_MOXA_CP118E_A_I	0x1183

#define	PCI_DEVICE_ID_MOXA_CP132EL	0x1322

#define	PCI_DEVICE_ID_MOXA_CP134EL_A	0x1342

#define	PCI_DEVICE_ID_MOXA_CP138E_A	0x1381

#define	PCI_DEVICE_ID_MOXA_CP168EL_A	0x1683



/* Unknown vendors/cards - this should not be in linux/pci_ids.h */

#define PCI_SUBDEVICE_ID_UNKNOWN_0x1584	0x1584

#define PCI_SUBDEVICE_ID_UNKNOWN_0x1588	0x1588



/*

 * Master list of serial port init/setup/exit quirks.

 * This does not describe the general nature of the port.