Commit 3029ad91 authored by Jiaqing Zhao's avatar Jiaqing Zhao Committed by Greg Kroah-Hartman
Browse files

can: ems_pci: move ASIX AX99100 ids to pci_ids.h 



Move PCI Vendor and Device ID of ASIX AX99100 PCIe to Multi I/O
Controller to pci_ids.h for its serial and parallel port driver
support in subsequent patches.

Signed-off-by: default avatarJiaqing Zhao <jiaqing.zhao@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Link: https://lore.kernel.org/r/20230724083933.3173513-3-jiaqing.zhao@linux.intel.com


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

drivers/net/can/sja1000/ems_pci.c

+1 −5
Original line number Diff line number Diff line
@@ -108,10 +108,6 @@ struct ems_pci_card { 


#define EMS_PCI_BASE_SIZE  4096 /* size of controller area */



#ifndef PCI_VENDOR_ID_ASIX

#define PCI_VENDOR_ID_ASIX 0x125b

#define PCI_DEVICE_ID_ASIX_9110 0x9110

#endif

#define PCI_SUBDEVICE_ID_EMS 0x4010



static const struct pci_device_id ems_pci_tbl[] = {
@@ -122,7 +118,7 @@ static const struct pci_device_id ems_pci_tbl[] = { 
	/* CPC-104P v2 */

	{PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030, PCI_VENDOR_ID_PLX, 0x4002},

	/* CPC-PCIe v3 */

	{PCI_VENDOR_ID_ASIX, PCI_DEVICE_ID_ASIX_9110, 0xa000, PCI_SUBDEVICE_ID_EMS},

	{PCI_VENDOR_ID_ASIX, PCI_DEVICE_ID_ASIX_AX99100_LB, 0xa000, PCI_SUBDEVICE_ID_EMS},

	{0,}

};

MODULE_DEVICE_TABLE(pci, ems_pci_tbl);

include/linux/pci_ids.h

+4 −0
Original line number Diff line number Diff line
@@ -1760,6 +1760,10 @@ 
#define PCI_SUBDEVICE_ID_AT_2700FX	0x2701

#define PCI_SUBDEVICE_ID_AT_2701FX	0x2703



#define PCI_VENDOR_ID_ASIX		0x125b

#define PCI_DEVICE_ID_ASIX_AX99100	0x9100

#define PCI_DEVICE_ID_ASIX_AX99100_LB	0x9110



#define PCI_VENDOR_ID_ESS		0x125d

#define PCI_DEVICE_ID_ESS_ESS1968	0x1968

#define PCI_DEVICE_ID_ESS_ESS1978	0x1978