forked from dlink-dir_819/openwrt
fbd31da840
In the new 6.12 kernel, the dependencies of kmod-usb3 and kmod-usb-xhci-pci-renesas have been reversed. To address the issue of package recursive dependencies, we need to backport this patchset to make the dependencies consistent between the 6.6 and 6.12 kernels. Links: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.10.y&id=d6b2b694dd536d16566424c395d5642783ed6f34 https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.11.y&id=9fdce69f674e49be669e97919d24b1ab5d2c9684 https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.12.y&id=25f51b76f90f10f9bf2fbc05fc51cf685da7ccad Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Link: https://github.com/openwrt/openwrt/pull/18768 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
From d6b2b694dd536d16566424c395d5642783ed6f34 Mon Sep 17 00:00:00 2001
|
|
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
|
|
Date: Mon, 29 Apr 2024 17:02:43 +0300
|
|
Subject: [PATCH] xhci: pci: Use PCI_VENDOR_ID_RENESAS
|
|
|
|
Instead of plain hexadecimal, use already defined PCI_VENDOR_ID_RENESAS.
|
|
|
|
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
|
|
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
|
|
Link: https://lore.kernel.org/r/20240429140245.3955523-17-mathias.nyman@linux.intel.com
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/usb/host/xhci-pci.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/usb/host/xhci-pci.c
|
|
+++ b/drivers/usb/host/xhci-pci.c
|
|
@@ -966,10 +966,10 @@ static const struct xhci_driver_data ren
|
|
|
|
/* PCI driver selection metadata; PCI hotplugging uses this */
|
|
static const struct pci_device_id pci_ids[] = {
|
|
- { PCI_DEVICE(0x1912, 0x0014),
|
|
+ { PCI_DEVICE(PCI_VENDOR_ID_RENESAS, 0x0014),
|
|
.driver_data = (unsigned long)&reneses_data,
|
|
},
|
|
- { PCI_DEVICE(0x1912, 0x0015),
|
|
+ { PCI_DEVICE(PCI_VENDOR_ID_RENESAS, 0x0015),
|
|
.driver_data = (unsigned long)&reneses_data,
|
|
},
|
|
/* handle any USB 3.0 xHCI controller */
|