diff options
author | David Bauer <mail@david-bauer.net> | 2022-01-13 10:06:20 +0100 |
---|---|---|
committer | David Bauer <mail@david-bauer.net> | 2022-01-13 20:30:59 +0100 |
commit | 43d105ec2aa2ee35c9687eab965ac8006e6484ce (patch) | |
tree | 5e65bd8062452e4f46c2a8ddbe75f0a9e5176aed /target/linux/apm821xx | |
parent | 1db847488de5a86e1ad203f51c88a5df72cc9e2f (diff) | |
download | upstream-43d105ec2aa2ee35c9687eab965ac8006e6484ce.tar.gz upstream-43d105ec2aa2ee35c9687eab965ac8006e6484ce.tar.bz2 upstream-43d105ec2aa2ee35c9687eab965ac8006e6484ce.zip |
kernel: bump 5.4 to 5.4.171
Compile-tested: ath79-generic ipq40xx-generic
Run-tested: ath79-generic
Signed-off-by: David Bauer <mail@david-bauer.net>
Diffstat (limited to 'target/linux/apm821xx')
-rw-r--r-- | target/linux/apm821xx/patches-5.4/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch | 8 | ||||
-rw-r--r-- | target/linux/apm821xx/patches-5.4/802-usb-xhci-force-msi-renesas-xhci.patch | 2 |
2 files changed, 5 insertions, 5 deletions
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 8a4d3f21fa..2ce7e7e30e 100644 --- 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 @@ -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; -@@ -331,6 +371,873 @@ static void xhci_pme_acpi_rtd3_enable(st +@@ -334,6 +374,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) { -@@ -372,6 +1279,27 @@ static int xhci_pci_probe(struct pci_dev +@@ -375,6 +1282,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 */ -@@ -433,6 +1361,16 @@ static void xhci_pci_remove(struct pci_d +@@ -436,6 +1364,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; -@@ -572,6 +1510,11 @@ static int xhci_pci_resume(struct usb_hc +@@ -575,6 +1513,11 @@ static int xhci_pci_resume(struct usb_hc if (pdev->vendor == PCI_VENDOR_ID_INTEL) usb_enable_intel_xhci_ports(pdev); diff --git a/target/linux/apm821xx/patches-5.4/802-usb-xhci-force-msi-renesas-xhci.patch b/target/linux/apm821xx/patches-5.4/802-usb-xhci-force-msi-renesas-xhci.patch index 0bca7ab4d5..cf62099649 100644 --- a/target/linux/apm821xx/patches-5.4/802-usb-xhci-force-msi-renesas-xhci.patch +++ b/target/linux/apm821xx/patches-5.4/802-usb-xhci-force-msi-renesas-xhci.patch @@ -13,7 +13,7 @@ produce a noisy warning. --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -299,6 +299,7 @@ static void xhci_pci_quirks(struct devic +@@ -302,6 +302,7 @@ static void xhci_pci_quirks(struct devic pdev->device == 0x0015) { xhci->quirks |= XHCI_RESET_ON_RESUME; xhci->quirks |= XHCI_ZERO_64B_REGS; |