From: Jiaqing Zhao <jiaqing.zhao@linux.intel.com>
To: Wolfgang Grandegger <wg@grandegger.com>,
Marc Kleine-Budde <mkl@pengutronix.de>
Cc: Gerhard Uttenthaler <uttenthaler@ems-wuensche.com>,
support@ems-wuensche.com,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
linux-can@vger.kernel.org, linux-pci@vger.kernel.org,
linux-kernel@vger.kernel.org,
Jiaqing Zhao <jiaqing.zhao@linux.intel.com>,
Bjorn Helgaas <bhelgaas@google.com>
Subject: [PATCH v2 2/2] can: ems_pci: move ASIX AX99100 ids to pci_ids.h
Date: Thu, 20 Jul 2023 10:28:59 +0000 [thread overview]
Message-ID: <20230720102859.2985655-3-jiaqing.zhao@linux.intel.com> (raw)
In-Reply-To: <20230720102859.2985655-1-jiaqing.zhao@linux.intel.com>
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: Jiaqing Zhao <jiaqing.zhao@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/net/can/sja1000/ems_pci.c | 6 +-----
include/linux/pci_ids.h | 4 ++++
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/can/sja1000/ems_pci.c b/drivers/net/can/sja1000/ems_pci.c
index 3e18c63a982c..1aaedaf866f1 100644
--- a/drivers/net/can/sja1000/ems_pci.c
+++ b/drivers/net/can/sja1000/ems_pci.c
@@ -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);
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 2dc75df1437f..16608ce4fd0f 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -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
--
2.39.2
next prev parent reply other threads:[~2023-07-20 10:29 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-20 10:28 [PATCH v2 0/2] can: ems_pci: refine PCI IDs for ASIX AX99100 Jiaqing Zhao
2023-07-20 10:28 ` [PATCH v2 1/2] can: ems_pci: remove PCI_SUBVENDOR_ID_ASIX definition Jiaqing Zhao
2023-07-20 10:28 ` Jiaqing Zhao [this message]
2023-07-20 10:40 ` [PATCH v2 2/2] can: ems_pci: move ASIX AX99100 ids to pci_ids.h Marc Kleine-Budde
2023-07-20 14:54 ` Jiaqing Zhao
2023-07-26 11:38 ` Greg Kroah-Hartman
2023-07-26 11:47 ` Marc Kleine-Budde
2023-07-24 6:39 ` Jiaqing Zhao
2023-07-24 8:24 ` Marc Kleine-Budde
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230720102859.2985655-3-jiaqing.zhao@linux.intel.com \
--to=jiaqing.zhao@linux.intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bhelgaas@google.com \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mkl@pengutronix.de \
--cc=support@ems-wuensche.com \
--cc=uttenthaler@ems-wuensche.com \
--cc=wg@grandegger.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).