diff options
| author | John Audia <graysky@archlinux.us> | 2021-11-26 08:29:01 -0500 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-11-27 19:19:30 +0100 |
| commit | 894f483d203a34618a3c725c808b8811d69c4430 (patch) | |
| tree | f41f05cf32121486bae9b26bf510251a682ef6de /target/linux/bcm53xx | |
| parent | be077f48124b8bcedd7cdb552c050ce73a42e509 (diff) | |
| download | upstream-894f483d203a34618a3c725c808b8811d69c4430.tar.gz upstream-894f483d203a34618a3c725c808b8811d69c4430.tar.bz2 upstream-894f483d203a34618a3c725c808b8811d69c4430.zip | |
kernel: bump 5.10 to 5.10.82
Removed upstreamed:
bcm53xx/patches-5.10/033-v5.16-0014-ARM-dts-NSP-Fix-mpcore-mmc-node-names.patch
Manually rebased:
ipq806x/patches-5.10/086-ipq8064-fix-duplicate-node.patch
All other patches automatically rebased.
Build system: x86_64
Build-tested: bcm2711/RPi4B, ipq806x/R7800
Run-tested: bcm2711/RPi4B, ipq806x/R7800
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/bcm53xx')
3 files changed, 2 insertions, 42 deletions
diff --git a/target/linux/bcm53xx/patches-5.10/033-v5.16-0014-ARM-dts-NSP-Fix-mpcore-mmc-node-names.patch b/target/linux/bcm53xx/patches-5.10/033-v5.16-0014-ARM-dts-NSP-Fix-mpcore-mmc-node-names.patch deleted file mode 100644 index eab3fd3cae..0000000000 --- a/target/linux/bcm53xx/patches-5.10/033-v5.16-0014-ARM-dts-NSP-Fix-mpcore-mmc-node-names.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 15a563d008ef9d04df525f0c476cd7d7127bb883 Mon Sep 17 00:00:00 2001 -From: Matthew Hagan <mnhagan88@gmail.com> -Date: Sun, 29 Aug 2021 22:37:48 +0000 -Subject: [PATCH] ARM: dts: NSP: Fix mpcore, mmc node names - -Running dtbs_check yielded the issues with bcm-nsp.dtsi. - -Firstly this patch fixes the following message by appending "-bus" to -the mpcore node name: -mpcore@19000000: $nodename:0: 'mpcore@19000000' does not match '^([a-z][a-z0-9\\-]+-bus|bus|soc|axi|ahb|apb)(@[0-9a-f]+)?$' - -Secondly mmc node name. The label name can remain as is. -sdhci@21000: $nodename:0: 'sdhci@21000' does not match '^mmc(@.*)?$' - -Signed-off-by: Matthew Hagan <mnhagan88@gmail.com> -Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> ---- - arch/arm/boot/dts/bcm-nsp.dtsi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/arch/arm/boot/dts/bcm-nsp.dtsi -+++ b/arch/arm/boot/dts/bcm-nsp.dtsi -@@ -77,7 +77,7 @@ - interrupt-affinity = <&cpu0>, <&cpu1>; - }; - -- mpcore@19000000 { -+ mpcore-bus@19000000 { - compatible = "simple-bus"; - ranges = <0x00000000 0x19000000 0x00023000>; - #address-cells = <1>; -@@ -219,7 +219,7 @@ - status = "disabled"; - }; - -- sdio: sdhci@21000 { -+ sdio: mmc@21000 { - compatible = "brcm,sdhci-iproc-cygnus"; - reg = <0x21000 0x100>; - interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>; diff --git a/target/linux/bcm53xx/patches-5.10/033-v5.16-0021-ARM-BCM53016-Specify-switch-ports-for-Meraki-MR32.patch b/target/linux/bcm53xx/patches-5.10/033-v5.16-0021-ARM-BCM53016-Specify-switch-ports-for-Meraki-MR32.patch index a65b1992ea..35f697c66f 100644 --- a/target/linux/bcm53xx/patches-5.10/033-v5.16-0021-ARM-BCM53016-Specify-switch-ports-for-Meraki-MR32.patch +++ b/target/linux/bcm53xx/patches-5.10/033-v5.16-0021-ARM-BCM53016-Specify-switch-ports-for-Meraki-MR32.patch @@ -29,7 +29,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> --- a/arch/arm/boot/dts/bcm53016-meraki-mr32.dts +++ b/arch/arm/boot/dts/bcm53016-meraki-mr32.dts -@@ -195,3 +195,25 @@ +@@ -217,3 +217,25 @@ }; }; }; diff --git a/target/linux/bcm53xx/patches-5.10/034-v5.17-0004-ARM-BCM53016-MR32-convert-to-Broadcom-iProc-I2C-Driv.patch b/target/linux/bcm53xx/patches-5.10/034-v5.17-0004-ARM-BCM53016-MR32-convert-to-Broadcom-iProc-I2C-Driv.patch index fae0f02cdf..6118e98cc5 100644 --- a/target/linux/bcm53xx/patches-5.10/034-v5.17-0004-ARM-BCM53016-MR32-convert-to-Broadcom-iProc-I2C-Driv.patch +++ b/target/linux/bcm53xx/patches-5.10/034-v5.17-0004-ARM-BCM53016-MR32-convert-to-Broadcom-iProc-I2C-Driv.patch @@ -70,7 +70,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> }; &uart0 { -@@ -228,3 +194,31 @@ +@@ -250,3 +216,31 @@ }; }; }; |