From 425d9ffd0dd6d30bf43a2050f23dc890001b6127 Mon Sep 17 00:00:00 2001 From: John Audia Date: Wed, 16 Mar 2022 16:06:23 -0400 Subject: [PATCH] kernel: bump 5.10 to 5.10.106 All patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia (cherry picked from commit b04d38a2eaa5604aa7216e0c02846d96dc2d317f) --- include/kernel-5.10 | 4 ++-- ...56-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch | 2 +- .../950-0361-ARM-dts-Expand-PCIe-space-on-BCM2711.patch | 2 +- ...950-0388-dt-Use-compatible-string-for-BCM2711-DSI1.patch | 2 +- ...2-ARM-dts-bcm2711-Add-the-CEC-interrupt-controller.patch | 6 +++--- ...m2711-Disable-bsc_intr-and-aon_intr-by-default-and.patch | 2 +- .../950-0464-bcm2711-Remove-old-GIC-interrupt.patch | 4 ++-- ...m-vc4-Fix-VEC-address-for-BCM2711-in-the-devicetre.patch | 2 +- .../950-0580-drm-vc4-Separate-VEC-compatible-variants.patch | 2 +- ...ARM-dts-bcm2711-Tune-DMA-parameters-for-HDMI-audio.patch | 4 ++-- ...0697-ARM-dts-bcm2711-fold-in-the-correct-interrupt.patch | 4 ++-- ...1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch | 4 ++-- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/kernel-5.10 b/include/kernel-5.10 index 2c11b30fc2..c1fb9ba55d 100644 --- a/include/kernel-5.10 +++ b/include/kernel-5.10 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.10 = .105 -LINUX_KERNEL_HASH-5.10.105 = 3ddc0e0ab2b9cadb64df43141e0a1e5432b5963ed50f34d586c065ac8d4fcb85 +LINUX_VERSION-5.10 = .106 +LINUX_KERNEL_HASH-5.10.106 = c68651c8c70e2443ab6ebd1a3ed4e06694f988ffa40a664d8374f0cee0a3597a diff --git a/target/linux/bcm27xx/patches-5.10/950-0256-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch b/target/linux/bcm27xx/patches-5.10/950-0256-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch index 4defea7e16..fb57e916c5 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0256-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0256-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch @@ -37,7 +37,7 @@ Signed-off-by: Phil Elwell gpiod_err(desc, "%s: tried to set a GPIO tied to an IRQ as output\n", __func__); -@@ -3250,8 +3252,8 @@ int gpiochip_lock_as_irq(struct gpio_chi +@@ -3260,8 +3262,8 @@ int gpiochip_lock_as_irq(struct gpio_chi } /* To be valid for IRQ the line needs to be input or open drain */ diff --git a/target/linux/bcm27xx/patches-5.10/950-0361-ARM-dts-Expand-PCIe-space-on-BCM2711.patch b/target/linux/bcm27xx/patches-5.10/950-0361-ARM-dts-Expand-PCIe-space-on-BCM2711.patch index 5dfc9221c5..2f115ea39d 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0361-ARM-dts-Expand-PCIe-space-on-BCM2711.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0361-ARM-dts-Expand-PCIe-space-on-BCM2711.patch @@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi -@@ -509,8 +509,8 @@ +@@ -510,8 +510,8 @@ msi-controller; msi-parent = <&pcie0>; diff --git a/target/linux/bcm27xx/patches-5.10/950-0388-dt-Use-compatible-string-for-BCM2711-DSI1.patch b/target/linux/bcm27xx/patches-5.10/950-0388-dt-Use-compatible-string-for-BCM2711-DSI1.patch index b409d5c534..6d919aee96 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0388-dt-Use-compatible-string-for-BCM2711-DSI1.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0388-dt-Use-compatible-string-for-BCM2711-DSI1.patch @@ -13,7 +13,7 @@ Signed-off-by: Dave Stevenson --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi -@@ -560,6 +560,7 @@ +@@ -561,6 +561,7 @@ &dsi1 { interrupts = ; diff --git a/target/linux/bcm27xx/patches-5.10/950-0462-ARM-dts-bcm2711-Add-the-CEC-interrupt-controller.patch b/target/linux/bcm27xx/patches-5.10/950-0462-ARM-dts-bcm2711-Add-the-CEC-interrupt-controller.patch index 1821b1e6b4..24ca6c61a5 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0462-ARM-dts-bcm2711-Add-the-CEC-interrupt-controller.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0462-ARM-dts-bcm2711-Add-the-CEC-interrupt-controller.patch @@ -17,7 +17,7 @@ Signed-off-by: Maxime Ripard --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi -@@ -308,6 +308,14 @@ +@@ -309,6 +309,14 @@ #reset-cells = <1>; }; @@ -32,7 +32,7 @@ Signed-off-by: Maxime Ripard hdmi0: hdmi@7ef00700 { compatible = "brcm,bcm2711-hdmi0"; reg = <0x7ef00700 0x300>, -@@ -336,6 +344,11 @@ +@@ -337,6 +345,11 @@ <&clk_27MHz>; clock-names = "hdmi", "bvb", "audio", "cec"; resets = <&dvp 0>; @@ -44,7 +44,7 @@ Signed-off-by: Maxime Ripard ddc = <&ddc0>; dmas = <&dma 10>; dma-names = "audio-rx"; -@@ -380,6 +393,11 @@ +@@ -381,6 +394,11 @@ <&dvp 0>, <&clk_27MHz>; resets = <&dvp 1>; diff --git a/target/linux/bcm27xx/patches-5.10/950-0463-bcm2711-Disable-bsc_intr-and-aon_intr-by-default-and.patch b/target/linux/bcm27xx/patches-5.10/950-0463-bcm2711-Disable-bsc_intr-and-aon_intr-by-default-and.patch index 168567b4ff..39714c564d 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0463-bcm2711-Disable-bsc_intr-and-aon_intr-by-default-and.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0463-bcm2711-Disable-bsc_intr-and-aon_intr-by-default-and.patch @@ -12,7 +12,7 @@ Signed-off-by: Dom Cobley --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi -@@ -314,6 +314,7 @@ +@@ -315,6 +315,7 @@ interrupts = ; interrupt-controller; #interrupt-cells = <1>; diff --git a/target/linux/bcm27xx/patches-5.10/950-0464-bcm2711-Remove-old-GIC-interrupt.patch b/target/linux/bcm27xx/patches-5.10/950-0464-bcm2711-Remove-old-GIC-interrupt.patch index 2d1b6ac45c..aaf2d6981b 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0464-bcm2711-Remove-old-GIC-interrupt.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0464-bcm2711-Remove-old-GIC-interrupt.patch @@ -12,7 +12,7 @@ Signed-off-by: Dom Cobley --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi -@@ -353,7 +353,6 @@ +@@ -354,7 +354,6 @@ ddc = <&ddc0>; dmas = <&dma 10>; dma-names = "audio-rx"; @@ -20,7 +20,7 @@ Signed-off-by: Dom Cobley status = "disabled"; }; -@@ -401,7 +400,6 @@ +@@ -402,7 +401,6 @@ "wakeup", "hpd-connected", "hpd-removed"; dmas = <&dma 17>; dma-names = "audio-rx"; diff --git a/target/linux/bcm27xx/patches-5.10/950-0579-drm-vc4-Fix-VEC-address-for-BCM2711-in-the-devicetre.patch b/target/linux/bcm27xx/patches-5.10/950-0579-drm-vc4-Fix-VEC-address-for-BCM2711-in-the-devicetre.patch index ae036000c2..dd820ad281 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0579-drm-vc4-Fix-VEC-address-for-BCM2711-in-the-devicetre.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0579-drm-vc4-Fix-VEC-address-for-BCM2711-in-the-devicetre.patch @@ -21,7 +21,7 @@ Signed-off-by: Mateusz Kwiatkowski --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi -@@ -300,6 +300,14 @@ +@@ -301,6 +301,14 @@ status = "disabled"; }; diff --git a/target/linux/bcm27xx/patches-5.10/950-0580-drm-vc4-Separate-VEC-compatible-variants.patch b/target/linux/bcm27xx/patches-5.10/950-0580-drm-vc4-Separate-VEC-compatible-variants.patch index e38f5fc600..99d49f3573 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0580-drm-vc4-Separate-VEC-compatible-variants.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0580-drm-vc4-Separate-VEC-compatible-variants.patch @@ -34,7 +34,7 @@ Signed-off-by: Mateusz Kwiatkowski maxItems: 1 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi -@@ -301,7 +301,7 @@ +@@ -302,7 +302,7 @@ }; vec: vec@7ec13000 { diff --git a/target/linux/bcm27xx/patches-5.10/950-0638-ARM-dts-bcm2711-Tune-DMA-parameters-for-HDMI-audio.patch b/target/linux/bcm27xx/patches-5.10/950-0638-ARM-dts-bcm2711-Tune-DMA-parameters-for-HDMI-audio.patch index c4a3492c82..b4b9d22fe1 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0638-ARM-dts-bcm2711-Tune-DMA-parameters-for-HDMI-audio.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0638-ARM-dts-bcm2711-Tune-DMA-parameters-for-HDMI-audio.patch @@ -15,7 +15,7 @@ Signed-off-by: Maxime Ripard --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi -@@ -359,7 +359,7 @@ +@@ -360,7 +360,7 @@ interrupt-names = "cec-tx", "cec-rx", "cec-low", "wakeup", "hpd-connected", "hpd-removed"; ddc = <&ddc0>; @@ -24,7 +24,7 @@ Signed-off-by: Maxime Ripard dma-names = "audio-rx"; status = "disabled"; }; -@@ -406,7 +406,7 @@ +@@ -407,7 +407,7 @@ <9>, <10>, <11>; interrupt-names = "cec-tx", "cec-rx", "cec-low", "wakeup", "hpd-connected", "hpd-removed"; diff --git a/target/linux/bcm27xx/patches-5.10/950-0697-ARM-dts-bcm2711-fold-in-the-correct-interrupt.patch b/target/linux/bcm27xx/patches-5.10/950-0697-ARM-dts-bcm2711-fold-in-the-correct-interrupt.patch index 5965d1c1dc..87b63167e1 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0697-ARM-dts-bcm2711-fold-in-the-correct-interrupt.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0697-ARM-dts-bcm2711-fold-in-the-correct-interrupt.patch @@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi -@@ -304,7 +304,7 @@ +@@ -305,7 +305,7 @@ compatible = "brcm,bcm2711-vec"; reg = <0x7ec13000 0x1000>; clocks = <&clocks BCM2835_CLOCK_VEC>; @@ -23,7 +23,7 @@ Signed-off-by: Phil Elwell status = "disabled"; }; -@@ -1114,7 +1114,3 @@ +@@ -1115,7 +1115,3 @@ &usb { interrupts = ; }; diff --git a/target/linux/generic/backport-5.10/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch b/target/linux/generic/backport-5.10/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch index e49e5c2858..60b07e5a3e 100644 --- a/target/linux/generic/backport-5.10/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch +++ b/target/linux/generic/backport-5.10/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch @@ -423,7 +423,7 @@ Signed-off-by: David S. Miller if (bgmac->irq < 0) --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c -@@ -4456,7 +4456,6 @@ static int macb_probe(struct platform_de +@@ -4479,7 +4479,6 @@ static int macb_probe(struct platform_de struct net_device *dev; struct resource *regs; void __iomem *mem; @@ -431,7 +431,7 @@ Signed-off-by: David S. Miller struct macb *bp; int err, val; -@@ -4569,15 +4568,11 @@ static int macb_probe(struct platform_de +@@ -4592,15 +4591,11 @@ static int macb_probe(struct platform_de if (bp->caps & MACB_CAPS_NEEDS_RSTONUBR) bp->rx_intr_mask |= MACB_BIT(RXUBR);