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 --- ...RM-dts-BCM5301X-Add-DT-for-Luxul-XWC-2000.patch | 2 +- ...-add-support-for-performing-fake-doorbell.patch | 20 +++----- ...BCM5301X-Update-Northstar-pinctrl-binding.patch | 2 +- ...310-ARM-BCM5301X-Add-DT-for-Netgear-R7900.patch | 2 +- ...-Add-power-button-for-Buffalo-WZR-1750DHP.patch | 6 +-- ...M-dts-BCM5301X-Add-serial-to-the-bootargs.patch | 54 ++++++++-------------- ...M-dts-BCM5301X-Describe-partition-formats.patch | 2 +- ...t-EOF-mark-and-erase-all-remaining-blocks.patch | 8 ++-- .../patches-5.4/905-BCM53573-minor-hacks.patch | 6 +-- 9 files changed, 39 insertions(+), 63 deletions(-) (limited to 'target/linux/bcm53xx') diff --git a/target/linux/bcm53xx/patches-5.4/130-ARM-dts-BCM5301X-Add-DT-for-Luxul-XWC-2000.patch b/target/linux/bcm53xx/patches-5.4/130-ARM-dts-BCM5301X-Add-DT-for-Luxul-XWC-2000.patch index beeeda7b95..639bbb8e49 100644 --- a/target/linux/bcm53xx/patches-5.4/130-ARM-dts-BCM5301X-Add-DT-for-Luxul-XWC-2000.patch +++ b/target/linux/bcm53xx/patches-5.4/130-ARM-dts-BCM5301X-Add-DT-for-Luxul-XWC-2000.patch @@ -14,7 +14,7 @@ Signed-off-by: Dan Haab --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -111,6 +111,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ +@@ -113,6 +113,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ bcm47094-luxul-abr-4500.dtb \ bcm47094-luxul-xap-1610.dtb \ bcm47094-luxul-xbr-4500.dtb \ diff --git a/target/linux/bcm53xx/patches-5.4/180-usb-xhci-add-support-for-performing-fake-doorbell.patch b/target/linux/bcm53xx/patches-5.4/180-usb-xhci-add-support-for-performing-fake-doorbell.patch index be7a52a936..d0ffcee460 100644 --- a/target/linux/bcm53xx/patches-5.4/180-usb-xhci-add-support-for-performing-fake-doorbell.patch +++ b/target/linux/bcm53xx/patches-5.4/180-usb-xhci-add-support-for-performing-fake-doorbell.patch @@ -17,10 +17,8 @@ it on BCM4708 family. drivers/usb/host/xhci.h | 1 + 3 files changed, 67 insertions(+), 3 deletions(-) -Index: linux-5.4.11/drivers/usb/host/xhci-plat.c -=================================================================== ---- linux-5.4.11.orig/drivers/usb/host/xhci-plat.c -+++ linux-5.4.11/drivers/usb/host/xhci-plat.c +--- a/drivers/usb/host/xhci-plat.c ++++ b/drivers/usb/host/xhci-plat.c @@ -67,6 +67,8 @@ static int xhci_priv_resume_quirk(struct static void xhci_plat_quirks(struct device *dev, struct xhci_hcd *xhci) { @@ -40,10 +38,8 @@ Index: linux-5.4.11/drivers/usb/host/xhci-plat.c } /* called during probe() after chip reset completes */ -Index: linux-5.4.11/drivers/usb/host/xhci.c -=================================================================== ---- linux-5.4.11.orig/drivers/usb/host/xhci.c -+++ linux-5.4.11/drivers/usb/host/xhci.c +--- a/drivers/usb/host/xhci.c ++++ b/drivers/usb/host/xhci.c @@ -156,6 +156,49 @@ int xhci_start(struct xhci_hcd *xhci) return ret; } @@ -129,11 +125,9 @@ Index: linux-5.4.11/drivers/usb/host/xhci.c } /* -Index: linux-5.4.11/drivers/usb/host/xhci.h -=================================================================== ---- linux-5.4.11.orig/drivers/usb/host/xhci.h -+++ linux-5.4.11/drivers/usb/host/xhci.h -@@ -1867,6 +1867,7 @@ struct xhci_hcd { +--- a/drivers/usb/host/xhci.h ++++ b/drivers/usb/host/xhci.h +@@ -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/bcm53xx/patches-5.4/302-ARM-dts-BCM5301X-Update-Northstar-pinctrl-binding.patch b/target/linux/bcm53xx/patches-5.4/302-ARM-dts-BCM5301X-Update-Northstar-pinctrl-binding.patch index d1d287588c..77bc68c8ce 100644 --- a/target/linux/bcm53xx/patches-5.4/302-ARM-dts-BCM5301X-Update-Northstar-pinctrl-binding.patch +++ b/target/linux/bcm53xx/patches-5.4/302-ARM-dts-BCM5301X-Update-Northstar-pinctrl-binding.patch @@ -9,7 +9,7 @@ Signed-off-by: Rafał Miłecki --- a/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi -@@ -400,16 +400,12 @@ +@@ -401,16 +401,12 @@ #size-cells = <1>; cru@100 { diff --git a/target/linux/bcm53xx/patches-5.4/310-ARM-BCM5301X-Add-DT-for-Netgear-R7900.patch b/target/linux/bcm53xx/patches-5.4/310-ARM-BCM5301X-Add-DT-for-Netgear-R7900.patch index fca2b88ed8..b0800e50ae 100644 --- a/target/linux/bcm53xx/patches-5.4/310-ARM-BCM5301X-Add-DT-for-Netgear-R7900.patch +++ b/target/linux/bcm53xx/patches-5.4/310-ARM-BCM5301X-Add-DT-for-Netgear-R7900.patch @@ -9,7 +9,7 @@ Signed-off-by: Rafał Miłecki --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -104,6 +104,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ +@@ -106,6 +106,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ bcm4709-buffalo-wxr-1900dhp.dtb \ bcm4709-linksys-ea9200.dtb \ bcm4709-netgear-r7000.dtb \ diff --git a/target/linux/bcm53xx/patches-5.4/311-ARM-BCM5301X-Add-power-button-for-Buffalo-WZR-1750DHP.patch b/target/linux/bcm53xx/patches-5.4/311-ARM-BCM5301X-Add-power-button-for-Buffalo-WZR-1750DHP.patch index 5ebc7f89f2..b3cb5de048 100644 --- a/target/linux/bcm53xx/patches-5.4/311-ARM-BCM5301X-Add-power-button-for-Buffalo-WZR-1750DHP.patch +++ b/target/linux/bcm53xx/patches-5.4/311-ARM-BCM5301X-Add-power-button-for-Buffalo-WZR-1750DHP.patch @@ -5,9 +5,9 @@ Signed-off-by: Felix Fietkau --- --- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts +++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts -@@ -101,6 +101,12 @@ - #address-cells = <1>; - #size-cells = <0>; +@@ -100,6 +100,12 @@ + gpio-keys { + compatible = "gpio-keys"; + power { + label = "Power"; diff --git a/target/linux/bcm53xx/patches-5.4/320-ARM-dts-BCM5301X-Add-serial-to-the-bootargs.patch b/target/linux/bcm53xx/patches-5.4/320-ARM-dts-BCM5301X-Add-serial-to-the-bootargs.patch index 2f3e287d4e..cbba087daa 100644 --- a/target/linux/bcm53xx/patches-5.4/320-ARM-dts-BCM5301X-Add-serial-to-the-bootargs.patch +++ b/target/linux/bcm53xx/patches-5.4/320-ARM-dts-BCM5301X-Add-serial-to-the-bootargs.patch @@ -13,10 +13,8 @@ This is a workaround to get serial working in LEDE. Signed-off-by: Rafał Miłecki --- -Index: linux-5.4.11/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts -=================================================================== ---- linux-5.4.11.orig/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts -+++ linux-5.4.11/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts +--- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts ++++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts @@ -12,7 +12,7 @@ model = "TP-LINK Archer C5 V2"; @@ -26,10 +24,8 @@ Index: linux-5.4.11/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts }; memory@0 { -Index: linux-5.4.11/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts -=================================================================== ---- linux-5.4.11.orig/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts -+++ linux-5.4.11/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts +--- a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts ++++ b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts @@ -13,7 +13,7 @@ model = "Luxul ABR-4500 V1"; @@ -39,10 +35,8 @@ Index: linux-5.4.11/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts }; memory@0 { -Index: linux-5.4.11/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts -=================================================================== ---- linux-5.4.11.orig/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts -+++ linux-5.4.11/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts +--- a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts ++++ b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts @@ -13,7 +13,7 @@ model = "Luxul XBR-4500 V1"; @@ -52,10 +46,8 @@ Index: linux-5.4.11/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts }; memory@0 { -Index: linux-5.4.11/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts -=================================================================== ---- linux-5.4.11.orig/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts -+++ linux-5.4.11/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts +--- a/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts ++++ b/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts @@ -12,7 +12,7 @@ model = "Luxul XAP-1440 V1"; @@ -65,10 +57,8 @@ Index: linux-5.4.11/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts }; memory@0 { -Index: linux-5.4.11/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts -=================================================================== ---- linux-5.4.11.orig/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts -+++ linux-5.4.11/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts +--- a/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts ++++ b/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts @@ -12,7 +12,7 @@ model = "Luxul XAP-810 V1"; @@ -78,10 +68,8 @@ Index: linux-5.4.11/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts }; memory@0 { -Index: linux-5.4.11/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts -=================================================================== ---- linux-5.4.11.orig/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts -+++ linux-5.4.11/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts +--- a/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts ++++ b/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts @@ -12,7 +12,7 @@ model = "Luxul XAP-1610 V1"; @@ -91,10 +79,8 @@ Index: linux-5.4.11/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts }; memory@0 { -Index: linux-5.4.11/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts -=================================================================== ---- linux-5.4.11.orig/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts -+++ linux-5.4.11/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts +--- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts ++++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts @@ -13,7 +13,7 @@ model = "Luxul XWR-3150 V1"; @@ -104,10 +90,8 @@ Index: linux-5.4.11/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts }; memory@0 { -Index: linux-5.4.11/arch/arm/boot/dts/bcm47094-phicomm-k3.dts -=================================================================== ---- linux-5.4.11.orig/arch/arm/boot/dts/bcm47094-phicomm-k3.dts -+++ linux-5.4.11/arch/arm/boot/dts/bcm47094-phicomm-k3.dts +--- a/arch/arm/boot/dts/bcm47094-phicomm-k3.dts ++++ b/arch/arm/boot/dts/bcm47094-phicomm-k3.dts @@ -13,6 +13,10 @@ compatible = "phicomm,k3", "brcm,bcm47094", "brcm,bcm4708"; model = "Phicomm K3"; @@ -119,10 +103,8 @@ Index: linux-5.4.11/arch/arm/boot/dts/bcm47094-phicomm-k3.dts memory@0 { device_type = "memory"; reg = <0x00000000 0x08000000 -Index: linux-5.4.11/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts -=================================================================== ---- linux-5.4.11.orig/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts -+++ linux-5.4.11/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts +--- a/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts ++++ b/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts @@ -13,7 +13,7 @@ model = "Luxul XWC-2000 V1"; diff --git a/target/linux/bcm53xx/patches-5.4/321-ARM-dts-BCM5301X-Describe-partition-formats.patch b/target/linux/bcm53xx/patches-5.4/321-ARM-dts-BCM5301X-Describe-partition-formats.patch index 66ae6dca33..f2861177dd 100644 --- a/target/linux/bcm53xx/patches-5.4/321-ARM-dts-BCM5301X-Describe-partition-formats.patch +++ b/target/linux/bcm53xx/patches-5.4/321-ARM-dts-BCM5301X-Describe-partition-formats.patch @@ -15,7 +15,7 @@ Signed-off-by: Rafał Miłecki --- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts +++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts -@@ -34,6 +34,7 @@ +@@ -35,6 +35,7 @@ partition@0 { label = "firmware"; reg = <0x00000000 0x08000000>; diff --git a/target/linux/bcm53xx/patches-5.4/500-UBI-Detect-EOF-mark-and-erase-all-remaining-blocks.patch b/target/linux/bcm53xx/patches-5.4/500-UBI-Detect-EOF-mark-and-erase-all-remaining-blocks.patch index 6d7a45f7ba..339a8c5268 100644 --- a/target/linux/bcm53xx/patches-5.4/500-UBI-Detect-EOF-mark-and-erase-all-remaining-blocks.patch +++ b/target/linux/bcm53xx/patches-5.4/500-UBI-Detect-EOF-mark-and-erase-all-remaining-blocks.patch @@ -15,7 +15,7 @@ Signed-off-by: Rafał Miłecki --- a/drivers/mtd/ubi/attach.c +++ b/drivers/mtd/ubi/attach.c -@@ -95,6 +95,9 @@ static int self_check_ai(struct ubi_devi +@@ -82,6 +82,9 @@ static int self_check_ai(struct ubi_devi #define AV_ADD BIT(1) #define AV_FIND_OR_ADD (AV_FIND | AV_ADD) @@ -25,7 +25,7 @@ Signed-off-by: Rafał Miłecki /** * find_or_add_av - internal function to find a volume, add a volume or do * both (find and add if missing). -@@ -1592,6 +1595,8 @@ int ubi_attach(struct ubi_device *ubi, i +@@ -1580,6 +1583,8 @@ int ubi_attach(struct ubi_device *ubi, i if (!ai) return -ENOMEM; @@ -36,7 +36,7 @@ Signed-off-by: Rafał Miłecki if ((int)mtd_div_by_eb(ubi->mtd->size, ubi->mtd) <= UBI_FM_MAX_START) { --- a/drivers/mtd/ubi/io.c +++ b/drivers/mtd/ubi/io.c -@@ -723,6 +723,10 @@ int ubi_io_read_ec_hdr(struct ubi_device +@@ -710,6 +710,10 @@ int ubi_io_read_ec_hdr(struct ubi_device } magic = be32_to_cpu(ec_hdr->magic); @@ -49,7 +49,7 @@ Signed-off-by: Rafał Miłecki return UBI_IO_BAD_HDR_EBADMSG; --- a/drivers/mtd/ubi/ubi.h +++ b/drivers/mtd/ubi/ubi.h -@@ -833,6 +833,7 @@ extern struct mutex ubi_devices_mutex; +@@ -820,6 +820,7 @@ extern struct mutex ubi_devices_mutex; extern struct blocking_notifier_head ubi_notifiers; /* attach.c */ diff --git a/target/linux/bcm53xx/patches-5.4/905-BCM53573-minor-hacks.patch b/target/linux/bcm53xx/patches-5.4/905-BCM53573-minor-hacks.patch index 470b17a5ff..e3806b4e72 100644 --- a/target/linux/bcm53xx/patches-5.4/905-BCM53573-minor-hacks.patch +++ b/target/linux/bcm53xx/patches-5.4/905-BCM53573-minor-hacks.patch @@ -11,7 +11,7 @@ Signed-off-by: Rafał Miłecki --- a/arch/arm/boot/dts/bcm53573.dtsi +++ b/arch/arm/boot/dts/bcm53573.dtsi -@@ -53,6 +53,7 @@ +@@ -54,6 +54,7 @@ , , ; @@ -53,7 +53,7 @@ Signed-off-by: Rafał Miłecki if (err == -ENOENT) { --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c -@@ -17,6 +17,7 @@ +@@ -14,6 +14,7 @@ #include #include #include @@ -61,7 +61,7 @@ Signed-off-by: Rafał Miłecki #include #include #include -@@ -919,6 +920,16 @@ static void arch_timer_of_configure_rate +@@ -899,6 +900,16 @@ static void arch_timer_of_configure_rate if (of_property_read_u32(np, "clock-frequency", &arch_timer_rate)) arch_timer_rate = rate; -- cgit v1.2.3