From f9f62d43e448f58d25749efa8b2aabc7f2d51e53 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Mon, 9 Mar 2020 12:39:35 +0100 Subject: kernel: bump 5.4 to 5.4.24 Refreshed all patches. Compile-tested on: imx6 Runtime-tested on: imx6 Signed-off-by: Koen Vandeputte --- .../linux/bcm27xx/patches-5.4/950-0037-Add-dwc_otg-driver.patch | 2 +- .../950-0212-thermal-brcmstb_thermal-Add-BCM2838-support.patch | 8 ++++---- .../950-0219-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch | 2 +- ...272-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch | 4 ++-- .../950-0305-xhci-Use-more-event-ring-segment-table-entries.patch | 4 ++-- ...0-0327-kbuild-Allow-.dtbo-overlays-to-be-built-piecemeal.patch | 2 +- .../950-0442-thermal-brcmstb_thermal-Correct-SoC-name.patch | 6 +++--- 7 files changed, 14 insertions(+), 14 deletions(-) (limited to 'target/linux/bcm27xx') diff --git a/target/linux/bcm27xx/patches-5.4/950-0037-Add-dwc_otg-driver.patch b/target/linux/bcm27xx/patches-5.4/950-0037-Add-dwc_otg-driver.patch index bf4463ed52..970c78f4df 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0037-Add-dwc_otg-driver.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0037-Add-dwc_otg-driver.patch @@ -1040,7 +1040,7 @@ Signed-off-by: Jonathan Bell } --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5296,7 +5296,7 @@ static void port_event(struct usb_hub *h +@@ -5302,7 +5302,7 @@ static void port_event(struct usb_hub *h port_dev->over_current_count++; port_over_current_notify(port_dev); diff --git a/target/linux/bcm27xx/patches-5.4/950-0212-thermal-brcmstb_thermal-Add-BCM2838-support.patch b/target/linux/bcm27xx/patches-5.4/950-0212-thermal-brcmstb_thermal-Add-BCM2838-support.patch index 4193dec68f..6fed7ec4eb 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0212-thermal-brcmstb_thermal-Add-BCM2838-support.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0212-thermal-brcmstb_thermal-Add-BCM2838-support.patch @@ -62,8 +62,8 @@ Signed-off-by: Stefan Wahren + const struct brcmstb_thermal_of_data *socdata; }; - static void avs_tmon_get_coeffs(struct thermal_zone_device *tz, int *slope, -@@ -155,17 +162,18 @@ static inline u32 avs_tmon_temp_to_code( + /* Convert a HW code to a temperature reading (millidegree celsius) */ +@@ -142,17 +149,18 @@ static inline u32 avs_tmon_temp_to_code( static int brcmstb_get_temp(void *data, int *temp) { struct brcmstb_thermal_priv *priv = data; @@ -84,7 +84,7 @@ Signed-off-by: Stefan Wahren t = avs_tmon_code_to_temp(priv->thermal, val); if (t < 0) -@@ -290,13 +298,34 @@ static int brcmstb_set_trips(void *data, +@@ -277,13 +285,34 @@ static int brcmstb_set_trips(void *data, return 0; } @@ -121,7 +121,7 @@ Signed-off-by: Stefan Wahren {}, }; MODULE_DEVICE_TABLE(of, brcmstb_thermal_id_table); -@@ -317,11 +346,27 @@ static int brcmstb_thermal_probe(struct +@@ -304,11 +333,27 @@ static int brcmstb_thermal_probe(struct if (IS_ERR(priv->tmon_base)) return PTR_ERR(priv->tmon_base); diff --git a/target/linux/bcm27xx/patches-5.4/950-0219-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch b/target/linux/bcm27xx/patches-5.4/950-0219-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch index faba7d474a..1728ed70d3 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0219-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0219-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch @@ -10,7 +10,7 @@ Signed-off-by: Phil Elwell --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -241,6 +241,10 @@ static void xhci_pci_quirks(struct devic +@@ -243,6 +243,10 @@ static void xhci_pci_quirks(struct devic pdev->device == 0x3432) xhci->quirks |= XHCI_BROKEN_STREAMS; diff --git a/target/linux/bcm27xx/patches-5.4/950-0272-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch b/target/linux/bcm27xx/patches-5.4/950-0272-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch index 2044aa2bd9..50b9a9b4b4 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0272-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0272-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch @@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -242,8 +242,10 @@ static void xhci_pci_quirks(struct devic +@@ -244,8 +244,10 @@ static void xhci_pci_quirks(struct devic xhci->quirks |= XHCI_BROKEN_STREAMS; if (pdev->vendor == PCI_VENDOR_ID_VIA && @@ -80,7 +80,7 @@ Signed-off-by: Jonathan Bell /* --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1867,6 +1867,7 @@ struct xhci_hcd { +@@ -1872,6 +1872,7 @@ struct xhci_hcd { #define XHCI_DEFAULT_PM_RUNTIME_ALLOW BIT_ULL(33) #define XHCI_RESET_PLL_ON_DISCONNECT BIT_ULL(34) #define XHCI_SNPS_BROKEN_SUSPEND BIT_ULL(35) diff --git a/target/linux/bcm27xx/patches-5.4/950-0305-xhci-Use-more-event-ring-segment-table-entries.patch b/target/linux/bcm27xx/patches-5.4/950-0305-xhci-Use-more-event-ring-segment-table-entries.patch index 112e9be606..4b4766f739 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0305-xhci-Use-more-event-ring-segment-table-entries.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0305-xhci-Use-more-event-ring-segment-table-entries.patch @@ -22,7 +22,7 @@ Signed-off-by: Jonathan Bell --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -2482,9 +2482,11 @@ int xhci_mem_init(struct xhci_hcd *xhci, +@@ -2503,9 +2503,11 @@ int xhci_mem_init(struct xhci_hcd *xhci, * Event ring setup: Allocate a normal ring, but also setup * the event ring segment table (ERST). Section 4.9.3. */ @@ -36,7 +36,7 @@ Signed-off-by: Jonathan Bell if (!xhci->event_ring) goto fail; if (xhci_check_trb_in_td_math(xhci) < 0) -@@ -2497,7 +2499,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, +@@ -2518,7 +2520,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, /* set ERST count with the number of entries in the segment table */ val = readl(&xhci->ir_set->erst_size); val &= ERST_SIZE_MASK; diff --git a/target/linux/bcm27xx/patches-5.4/950-0327-kbuild-Allow-.dtbo-overlays-to-be-built-piecemeal.patch b/target/linux/bcm27xx/patches-5.4/950-0327-kbuild-Allow-.dtbo-overlays-to-be-built-piecemeal.patch index e94ac6c004..d02902a9b3 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0327-kbuild-Allow-.dtbo-overlays-to-be-built-piecemeal.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0327-kbuild-Allow-.dtbo-overlays-to-be-built-piecemeal.patch @@ -24,7 +24,7 @@ Signed-off-by: Phil Elwell --- a/Makefile +++ b/Makefile -@@ -1243,6 +1243,9 @@ ifneq ($(dtstree),) +@@ -1238,6 +1238,9 @@ ifneq ($(dtstree),) %.dtb: include/config/kernel.release scripts_dtc $(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@ diff --git a/target/linux/bcm27xx/patches-5.4/950-0442-thermal-brcmstb_thermal-Correct-SoC-name.patch b/target/linux/bcm27xx/patches-5.4/950-0442-thermal-brcmstb_thermal-Correct-SoC-name.patch index 7b1fbb0f70..5ba80afd98 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0442-thermal-brcmstb_thermal-Correct-SoC-name.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0442-thermal-brcmstb_thermal-Correct-SoC-name.patch @@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell --- a/drivers/thermal/broadcom/brcmstb_thermal.c +++ b/drivers/thermal/broadcom/brcmstb_thermal.c -@@ -303,7 +303,7 @@ static const struct thermal_zone_of_devi +@@ -290,7 +290,7 @@ static const struct thermal_zone_of_devi .set_trips = brcmstb_set_trips, }; @@ -23,7 +23,7 @@ Signed-off-by: Phil Elwell .get_temp = brcmstb_get_temp, }; -@@ -314,8 +314,8 @@ static const struct brcmstb_thermal_of_d +@@ -301,8 +301,8 @@ static const struct brcmstb_thermal_of_d .status_data_shift = 1, }; @@ -34,7 +34,7 @@ Signed-off-by: Phil Elwell .status_valid_mask = BIT(10), .status_data_mask = GENMASK(9, 0), .status_data_shift = 0, -@@ -324,8 +324,8 @@ static const struct brcmstb_thermal_of_d +@@ -311,8 +311,8 @@ static const struct brcmstb_thermal_of_d static const struct of_device_id brcmstb_thermal_id_table[] = { { .compatible = "brcm,avs-tmon", .data = &bcm7445_thermal_of_data }, -- cgit v1.2.3