Commit 4167bd25 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

mxser: move ids from pci_ids.h here 



There is no point having MOXA PCI device IDs in include/linux/pci_ids.h.
Move them to the driver and sort them all by the ID.

Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20211118073125.12283-19-jslaby@suse.cz


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

drivers/tty/mxser.c

+19 −1
Original line number Diff line number Diff line
@@ -159,14 +159,32 @@ 
#define MXSER_BAUD_BASE		921600

#define MXSER_CUSTOM_DIVISOR	(MXSER_BAUD_BASE * 16)



#define PCI_DEVICE_ID_MOXA_RC7000	0x0001

#define PCI_DEVICE_ID_MOXA_CP102	0x1020

#define PCI_DEVICE_ID_MOXA_CP102UL	0x1021

#define PCI_DEVICE_ID_MOXA_CP102U	0x1022

#define PCI_DEVICE_ID_MOXA_CP102UF	0x1023

#define PCI_DEVICE_ID_MOXA_C104		0x1040

#define PCI_DEVICE_ID_MOXA_CP104U	0x1041

#define PCI_DEVICE_ID_MOXA_CP104JU	0x1042

#define PCI_DEVICE_ID_MOXA_CP104EL	0x1043

#define PCI_DEVICE_ID_MOXA_POS104UL	0x1044

#define PCI_DEVICE_ID_MOXA_CB108	0x1080

#define PCI_DEVICE_ID_MOXA_CP102UF	0x1023

#define PCI_DEVICE_ID_MOXA_CP112UL	0x1120

#define PCI_DEVICE_ID_MOXA_CT114	0x1140

#define PCI_DEVICE_ID_MOXA_CP114	0x1141

#define PCI_DEVICE_ID_MOXA_CB114	0x1142

#define PCI_DEVICE_ID_MOXA_CP114UL	0x1143

#define PCI_DEVICE_ID_MOXA_CP118U	0x1180

#define PCI_DEVICE_ID_MOXA_CP118EL	0x1181

#define PCI_DEVICE_ID_MOXA_CP132	0x1320

#define PCI_DEVICE_ID_MOXA_CP132U	0x1321

#define PCI_DEVICE_ID_MOXA_CP134U	0x1340

#define PCI_DEVICE_ID_MOXA_CB134I	0x1341

#define PCI_DEVICE_ID_MOXA_CP138U	0x1380

#define PCI_DEVICE_ID_MOXA_C168		0x1680

#define PCI_DEVICE_ID_MOXA_CP168U	0x1681

#define PCI_DEVICE_ID_MOXA_CP168EL	0x1682



#define MXSER_NPORTS(ddata)		((ddata) & 0xffU)

#define MXSER_HIGHBAUD			0x0100

include/linux/pci_ids.h

+0 −18
Original line number Diff line number Diff line
@@ -1964,24 +1964,6 @@ 
#define PCI_DEVICE_ID_APPLICOM_PCI2000PFB 0x0003



#define PCI_VENDOR_ID_MOXA		0x1393

#define PCI_DEVICE_ID_MOXA_RC7000	0x0001

#define PCI_DEVICE_ID_MOXA_CP102	0x1020

#define PCI_DEVICE_ID_MOXA_CP102UL	0x1021

#define PCI_DEVICE_ID_MOXA_CP102U	0x1022

#define PCI_DEVICE_ID_MOXA_C104		0x1040

#define PCI_DEVICE_ID_MOXA_CP104U	0x1041

#define PCI_DEVICE_ID_MOXA_CP104JU	0x1042

#define PCI_DEVICE_ID_MOXA_CP104EL	0x1043

#define PCI_DEVICE_ID_MOXA_CT114	0x1140

#define PCI_DEVICE_ID_MOXA_CP114	0x1141

#define PCI_DEVICE_ID_MOXA_CP118U	0x1180

#define PCI_DEVICE_ID_MOXA_CP118EL	0x1181

#define PCI_DEVICE_ID_MOXA_CP132	0x1320

#define PCI_DEVICE_ID_MOXA_CP132U	0x1321

#define PCI_DEVICE_ID_MOXA_CP134U	0x1340

#define PCI_DEVICE_ID_MOXA_C168		0x1680

#define PCI_DEVICE_ID_MOXA_CP168U	0x1681

#define PCI_DEVICE_ID_MOXA_CP168EL	0x1682

#define PCI_DEVICE_ID_MOXA_CP204J	0x2040

#define PCI_DEVICE_ID_MOXA_C218		0x2180

#define PCI_DEVICE_ID_MOXA_C320		0x3200