kernel: bump 5.4 to 5.4.106

[openwrt/staging/wigyori.git] / target / linux / apm821xx / patches-5.4 / 801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch

diff --git a/target/linux/apm821xx/patches-5.4/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch b/target/linux/apm821xx/patches-5.4/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch
index cba8062f5520347dc6e5cf191c17ac7b0dbaad0d..dbed597973e91cfeaef1c7139e4b1121fd584db2 100644 (file)
--- a/target/linux/apm821xx/patches-5.4/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch
+++ b/target/linux/apm821xx/patches-5.4/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch
@@ -48,9 +48,9 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
  
  #include "xhci.h"
  #include "xhci-trace.h"
-@@ -63,6 +65,44 @@
- #define PCI_DEVICE_ID_ASMEDIA_1142_XHCI                       0x1242
+@@ -64,6 +66,44 @@
  #define PCI_DEVICE_ID_ASMEDIA_2142_XHCI                       0x2142
+ #define PCI_DEVICE_ID_ASMEDIA_3242_XHCI                       0x3242
  
 +#define RENESAS_FW_VERSION                            0x6C
 +#define RENESAS_ROM_CONFIG                            0xF0
@@ -93,7 +93,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
  static const char hcd_name[] = "xhci_hcd";
  
  static struct hc_driver __read_mostly xhci_pci_hc_driver;
-@@ -298,6 +338,873 @@ static void xhci_pme_acpi_rtd3_enable(st
+@@ -307,6 +347,873 @@ static void xhci_pme_acpi_rtd3_enable(st
  static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { }
  #endif /* CONFIG_ACPI */
  
@@ -967,7 +967,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
  /* called during probe() after chip reset completes */
  static int xhci_pci_setup(struct usb_hcd *hcd)
  {
-@@ -339,6 +1246,27 @@ static int xhci_pci_probe(struct pci_dev
+@@ -348,6 +1255,27 @@ static int xhci_pci_probe(struct pci_dev
        struct hc_driver *driver;
        struct usb_hcd *hcd;
  
@@ -995,7 +995,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
        driver = (struct hc_driver *)id->driver_data;
  
        /* Prevent runtime suspending between USB-2 and USB-3 initialization */
-@@ -400,6 +1328,16 @@ static void xhci_pci_remove(struct pci_d
+@@ -409,6 +1337,16 @@ static void xhci_pci_remove(struct pci_d
  {
        struct xhci_hcd *xhci;
  
@@ -1012,7 +1012,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
        xhci = hcd_to_xhci(pci_get_drvdata(dev));
        xhci->xhc_state |= XHCI_STATE_REMOVING;
  
-@@ -539,6 +1477,11 @@ static int xhci_pci_resume(struct usb_hc
+@@ -548,6 +1486,11 @@ static int xhci_pci_resume(struct usb_hc
        if (pdev->vendor == PCI_VENDOR_ID_INTEL)
                usb_enable_intel_xhci_ports(pdev);