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.2On 20.07.2023 10:28:59, Jiaqing Zhao wrote: > 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. Sorry, I haven't noticed the change in "include/linux/pci_ids.h", that the other patches depend on. How to coordinate among the subsystems? I don't mind taking the entire (v1) series with the Acks from the tty/serial and parport maintainers, or give my Acked-by to upstream via their trees. > 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(-) Marc -- Pengutronix e.K. | Marc Kleine-Budde | Embedded Linux | https://www.pengutronix.de | Vertretung Nürnberg | Phone: +49-5121-206917-129 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |
On 2023-07-20 18:40, Marc Kleine-Budde wrote: > On 20.07.2023 10:28:59, Jiaqing Zhao wrote: >> 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. > > Sorry, I haven't noticed the change in "include/linux/pci_ids.h", that > the other patches depend on. How to coordinate among the subsystems? > > I don't mind taking the entire (v1) series with the Acks from the > tty/serial and parport maintainers, or give my Acked-by to upstream > via their trees. Since in ems_pci there are only definition changes, I think having your Acked-by and upstream via the serial/parallel tree might be better. >> 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(-) > > Marc >
On 24.07.2023 14:39:58, Jiaqing Zhao wrote: > > > On 2023-07-20 18:40, Marc Kleine-Budde wrote: > > On 20.07.2023 10:28:59, Jiaqing Zhao wrote: > >> 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. > > > > Sorry, I haven't noticed the change in "include/linux/pci_ids.h", that > > the other patches depend on. How to coordinate among the subsystems? > > > > I don't mind taking the entire (v1) series with the Acks from the > > tty/serial and parport maintainers, or give my Acked-by to upstream > > via their trees. > > Since in ems_pci there are only definition changes, I think having your > Acked-by and upstream via the serial/parallel tree might be better. Fine with me. Please add my: Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> to the patches 1 and 2. regards, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Embedded Linux | https://www.pengutronix.de | Vertretung Nürnberg | Phone: +49-5121-206917-129 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |
On 2023-07-20 18:40, Marc Kleine-Budde wrote: > On 20.07.2023 10:28:59, Jiaqing Zhao wrote: >> 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. > > Sorry, I haven't noticed the change in "include/linux/pci_ids.h", that > the other patches depend on. How to coordinate among the subsystems? > > I don't mind taking the entire (v1) series with the Acks from the > tty/serial and parport maintainers, or give my Acked-by to upstream > via their trees. Add tty and parport maintainers to this thread. I'd like to ask other maintainers' opinion as I'm not sure which option is better and I had no similar experience before. >> 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(-) > > Marc >
On Thu, Jul 20, 2023 at 10:54:01PM +0800, Jiaqing Zhao wrote: > On 2023-07-20 18:40, Marc Kleine-Budde wrote: > > On 20.07.2023 10:28:59, Jiaqing Zhao wrote: > >> 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. > > > > Sorry, I haven't noticed the change in "include/linux/pci_ids.h", that > > the other patches depend on. How to coordinate among the subsystems? > > > > I don't mind taking the entire (v1) series with the Acks from the > > tty/serial and parport maintainers, or give my Acked-by to upstream > > via their trees. > > Add tty and parport maintainers to this thread. > > I'd like to ask other maintainers' opinion as I'm not sure which option > is better and I had no similar experience before. Either is fine with me, I can just take them all through my tty tree as that's simplest for me :) thanks, greg k-h
On 26.07.2023 13:38:22, Greg Kroah-Hartman wrote: > On Thu, Jul 20, 2023 at 10:54:01PM +0800, Jiaqing Zhao wrote: > > On 2023-07-20 18:40, Marc Kleine-Budde wrote: > > > On 20.07.2023 10:28:59, Jiaqing Zhao wrote: > > >> 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. > > > > > > Sorry, I haven't noticed the change in "include/linux/pci_ids.h", that > > > the other patches depend on. How to coordinate among the subsystems? > > > > > > I don't mind taking the entire (v1) series with the Acks from the > > > tty/serial and parport maintainers, or give my Acked-by to upstream > > > via their trees. > > > > Add tty and parport maintainers to this thread. > > > > I'd like to ask other maintainers' opinion as I'm not sure which option > > is better and I had no similar experience before. > > Either is fine with me, I can just take them all through my tty tree as > that's simplest for me :) Go ahead! Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> Marc -- Pengutronix e.K. | Marc Kleine-Budde | Embedded Linux | https://www.pengutronix.de | Vertretung Nürnberg | Phone: +49-5121-206917-129 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |
© 2016 - 2026 Red Hat, Inc.