bcm53xx: update DTS files with the latest changes

Signed-off-by: Rafał Miłecki <[email protected]>

target/linux/bcm53xx/patches-5.10/036-v5.19-0001-ARM-dts-BCM5301X-Update-pin-controller-node-name.patch

@@ -0,0 +1,32 @@
+From 130b5e32ba9d2d2313e39cf3f6d0729bff02b76a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <[email protected]>
+Date: Wed, 30 Mar 2022 14:05:27 +0200
+Subject: [PATCH] ARM: dts: BCM5301X: Update pin controller node name
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This fixes:
+arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dtb: cru-bus@100: 'pin-controller@1c0' does not match any of the regexes: '^clock-controller@[a-f0-9]+$', '^phy@[a-f0-9]+$', '^pinctrl@[a-f0-9]+$', '^syscon@[a-f0-9]+$', '^thermal@[a-f0-9]+$'
+        From schema: Documentation/devicetree/bindings/mfd/brcm,cru.yaml
+arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dtb: pin-controller@1c0: $nodename:0: 'pin-controller@1c0' does not match '^(pinctrl|pinmux)(@[0-9a-f]+)?$'
+        From schema: Documentation/devicetree/bindings/pinctrl/brcm,ns-pinmux.yaml
+
+Ref: e7391b021e3f ("dt-bindings: mfd: brcm,cru: Rename pinctrl node")
+Signed-off-by: Rafał Miłecki <[email protected]>
+Signed-off-by: Florian Fainelli <[email protected]>
+---
+ arch/arm/boot/dts/bcm5301x.dtsi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm/boot/dts/bcm5301x.dtsi
++++ b/arch/arm/boot/dts/bcm5301x.dtsi
+@@ -455,7 +455,7 @@
+ 				reg = <0x180 0x4>;
+ 			};
+ 
+-			pinctrl: pin-controller@1c0 {
++			pinctrl: pinctrl@1c0 {
+ 				compatible = "brcm,bcm4708-pinmux";
+ 				reg = <0x1c0 0x24>;
+ 				reg-names = "cru_gpio_control";

target/linux/bcm53xx/patches-5.10/036-v5.19-0002-ARM-dts-BCM5301X-Fix-DTC-warning-for-NAND-node.patch

@@ -0,0 +1,31 @@
+From 90103611d573c5c238350f9b1d7cb682c62f5681 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= <[email protected]>
+Date: Fri, 1 Apr 2022 13:19:58 +0300
+Subject: [PATCH] ARM: dts: BCM5301X: Fix DTC warning for NAND node
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Remove the unnecessary #address-cells and #size-cells properties on the
+nand@0 node to fix the warning below.
+
+Warning (avoid_unnecessary_addr_size): /nand-controller@18028000/nand@0: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
+
+Signed-off-by: Arınç ÜNAL <[email protected]>
+Acked-by: Rafał Miłecki <[email protected]>
+Signed-off-by: Florian Fainelli <[email protected]>
+---
+ arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi | 2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
++++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
+@@ -10,8 +10,6 @@
+ 		nandcs: nand@0 {
+ 			compatible = "brcm,nandcs";
+ 			reg = <0>;
+-			#address-cells = <1>;
+-			#size-cells = <1>;
+ 
+ 			partitions {
+ 				compatible = "brcm,bcm947xx-cfe-partitions";

target/linux/bcm53xx/patches-5.10/036-v5.19-0003-ARM-dts-BCM5301X-Remove-cell-properties-from-srab-po.patch

@@ -0,0 +1,40 @@
+From e5ff0a7aab3ef5dd8ec7636b936c95179aa5ddfa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= <[email protected]>
+Date: Fri, 1 Apr 2022 13:19:59 +0300
+Subject: [PATCH] ARM: dts: BCM5301X: Remove cell properties from srab ports on
+ Asus RT-AC88U
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Remove #address-cells and #size-cells properties from the ports node of
+&srab. They are already defined on bcm5301x.dtsi, there's no need to define
+them again.
+
+Signed-off-by: Arınç ÜNAL <[email protected]>
+Acked-by: Rafał Miłecki <[email protected]>
+Signed-off-by: Florian Fainelli <[email protected]>
+---
+ arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts
++++ b/arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts
+@@ -1,6 +1,6 @@
+ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+ /*
+- * Copyright (C) 2021 Arınç ÜNAL <[email protected]>
++ * Copyright (C) 2021-2022 Arınç ÜNAL <[email protected]>
+  */
+ 
+ /dts-v1/;
+@@ -177,9 +177,6 @@
+ 	dsa,member = <0 0>;
+ 
+ 	ports {
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+-
+ 		port@0 {
+ 			reg = <0>;
+ 			label = "lan4";

target/linux/bcm53xx/patches-5.10/036-v5.19-0004-ARM-dts-BCM5301X-Add-rgmii-to-port-5-of-Broadcom-swi.patch

@@ -0,0 +1,29 @@
+From 4b7a67420a34ebd8fbf0111221a8bfd8001d418d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= <[email protected]>
+Date: Fri, 1 Apr 2022 13:20:00 +0300
+Subject: [PATCH] ARM: dts: BCM5301X: Add rgmii to port@5 of Broadcom switch on
+ Asus RT-AC88U
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Define phy-mode of the Broadcom switch's port@5 as rgmii. This doesn't seem
+to matter but let's explicitly define it since phy-mode as rgmii is defined
+on the other side which is port@6 of the Realtek switch.
+
+Signed-off-by: Arınç ÜNAL <[email protected]>
+Signed-off-by: Florian Fainelli <[email protected]>
+---
+ arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts
++++ b/arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts
+@@ -205,6 +205,7 @@
+ 		sw0_p5: port@5 {
+ 			reg = <5>;
+ 			label = "extsw";
++			phy-mode = "rgmii";
+ 
+ 			fixed-link {
+ 				speed = <1000>;

target/linux/bcm53xx/patches-5.10/036-v5.19-0005-ARM-dts-BCM5301X-Retrieve-gmac1-MAC-address-from-NVR.patch

@@ -0,0 +1,43 @@
+From 7f7f8c7b9f3cbae1355fb3b0ce4ea9d6f1552521 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= <[email protected]>
+Date: Fri, 1 Apr 2022 13:20:01 +0300
+Subject: [PATCH] ARM: dts: BCM5301X: Retrieve gmac1 MAC address from NVRAM on
+ Asus RT-AC88U
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The et1macaddr NVRAM variable contains a MAC address for gmac1 on Asus
+RT-AC88U. Add NVMEM cell for it and reference it in the gmac1 node.
+
+Signed-off-by: Arınç ÜNAL <[email protected]>
+Acked-by: Rafał Miłecki <[email protected]>
+Signed-off-by: Florian Fainelli <[email protected]>
+---
+ arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts
++++ b/arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts
+@@ -25,6 +25,9 @@
+ 	nvram@1c080000 {
+ 		compatible = "brcm,nvram";
+ 		reg = <0x1c080000 0x00180000>;
++
++		et1macaddr: et1macaddr {
++		};
+ 	};
+ 
+ 	leds {
+@@ -239,6 +242,11 @@
+ 	};
+ };
+ 
++&gmac1 {
++	nvmem-cells = <&et1macaddr>;
++	nvmem-cell-names = "mac-address";
++};
++
+ &usb2 {
+ 	vcc-gpio = <&chipcommon 9 GPIO_ACTIVE_HIGH>;
+ };

target/linux/bcm53xx/patches-5.10/036-v5.19-0006-ARM-dts-BCM5301X-Fix-compatible-strings-for-BCM53012.patch

@@ -0,0 +1,65 @@
+From 69bb5c6f3f41fe6baa86a775c8a3e69dd27f85d6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= <[email protected]>
+Date: Sat, 2 Apr 2022 23:46:21 +0300
+Subject: [PATCH] ARM: dts: BCM5301X: Fix compatible strings for BCM53012 and
+ BCM53016 SoC
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix compatible strings for devicetrees using the BCM53012 and BCM53016 SoC.
+
+Signed-off-by: Arınç ÜNAL <[email protected]>
+Acked-by: Krzysztof Kozlowski <[email protected]>
+Signed-off-by: Florian Fainelli <[email protected]>
+---
+ arch/arm/boot/dts/bcm53016-meraki-mr32.dts | 2 +-
+ arch/arm/boot/dts/bcm953012er.dts          | 2 +-
+ arch/arm/boot/dts/bcm953012hr.dts          | 2 +-
+ arch/arm/boot/dts/bcm953012k.dts           | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm53016-meraki-mr32.dts
++++ b/arch/arm/boot/dts/bcm53016-meraki-mr32.dts
+@@ -13,7 +13,7 @@
+ #include <dt-bindings/leds/common.h>
+ 
+ / {
+-	compatible = "meraki,mr32", "brcm,brcm53016", "brcm,bcm4708";
++	compatible = "meraki,mr32", "brcm,bcm53016", "brcm,bcm4708";
+ 	model = "Meraki MR32";
+ 
+ 	chosen {
+--- a/arch/arm/boot/dts/bcm953012er.dts
++++ b/arch/arm/boot/dts/bcm953012er.dts
+@@ -37,7 +37,7 @@
+ 
+ / {
+ 	model = "NorthStar Enterprise Router (BCM953012ER)";
+-	compatible = "brcm,bcm953012er", "brcm,brcm53012", "brcm,bcm4708";
++	compatible = "brcm,bcm953012er", "brcm,bcm53012", "brcm,bcm4708";
+ 
+ 	memory@0 {
+ 		device_type = "memory";
+--- a/arch/arm/boot/dts/bcm953012hr.dts
++++ b/arch/arm/boot/dts/bcm953012hr.dts
+@@ -37,7 +37,7 @@
+ 
+ / {
+ 	model = "NorthStar HR (BCM953012HR)";
+-	compatible = "brcm,bcm953012hr", "brcm,brcm53012", "brcm,bcm4708";
++	compatible = "brcm,bcm953012hr", "brcm,bcm53012", "brcm,bcm4708";
+ 
+ 	aliases {
+ 		ethernet0 = &gmac0;
+--- a/arch/arm/boot/dts/bcm953012k.dts
++++ b/arch/arm/boot/dts/bcm953012k.dts
+@@ -36,7 +36,7 @@
+ 
+ / {
+ 	model = "NorthStar SVK (BCM953012K)";
+-	compatible = "brcm,bcm953012k", "brcm,brcm53012", "brcm,bcm4708";
++	compatible = "brcm,bcm953012k", "brcm,bcm53012", "brcm,bcm4708";
+ 
+ 	aliases {
+ 		serial0 = &uart0;

target/linux/bcm53xx/patches-5.10/036-v5.19-0007-ARM-dts-BCM5301X-Disable-gmac0-and-enable-port-8-on-.patch

@@ -0,0 +1,39 @@
+From b9cff8783439ff1803709128af3a0e04c5f5f047 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= <[email protected]>
+Date: Sun, 10 Apr 2022 12:44:55 +0300
+Subject: [PATCH] ARM: dts: BCM5301X: Disable gmac0 and enable port@8 on Asus
+ RT-AC88U
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Disable gmac0 which is not connected to any switch MAC. Enable port@8 of
+the Broadcom switch which is connected to gmac2.
+
+Signed-off-by: Arınç ÜNAL <[email protected]>
+Signed-off-by: Florian Fainelli <[email protected]>
+---
+ arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts
++++ b/arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts
+@@ -232,7 +232,6 @@
+ 			reg = <8>;
+ 			ethernet = <&gmac2>;
+ 			label = "cpu";
+-			status = "disabled";
+ 
+ 			fixed-link {
+ 				speed = <1000>;
+@@ -242,6 +241,10 @@
+ 	};
+ };
+ 
++&gmac0 {
++	status = "disabled";
++};
++
+ &gmac1 {
+ 	nvmem-cells = <&et1macaddr>;
+ 	nvmem-cell-names = "mac-address";

target/linux/bcm53xx/patches-5.10/036-v5.19-0008-ARM-dts-BCM5301X-Add-DT-for-WZR-1166DHP-DHP2.patch

@@ -0,0 +1,300 @@
+From 417aea4436bb658d8c5c4dcd0e3c255931d0ee96 Mon Sep 17 00:00:00 2001
+From: SHIMAMOTO Takayoshi <[email protected]>
+Date: Fri, 22 Apr 2022 00:10:54 +0900
+Subject: [PATCH] ARM: dts: BCM5301X: Add DT for WZR-1166DHP,DHP2
+
+Buffalo WZR-1166DHP/WZR-1166DHP2  wireless router with
+
+    - BCM4708A0
+    - 128MiB NAND flash
+    - 2T2R 11ac/a/b/g/n Wi-Fi
+    - 4x 10/100/1000M ethernet switch
+    - 1x USB 3.0 port
+
+  WZR-1166DHP and WZR-1166DHP2 have different memory capacity.
+
+  WZR-1166DHP
+    - 512 MiB DDR2 SDRAM
+
+  WZR-1166DHP2
+    - 256 MiB DDR2 SDRAM
+
+  These hardware components are very similar to the WZR-1750DHP
+   except for the number of antennas.
+
+Signed-off-by: SHIMAMOTO Takayoshi <[email protected]>
+Signed-off-by: Florian Fainelli <[email protected]>
+---
+ arch/arm/boot/dts/Makefile                    |   2 +
+ .../bcm4708-buffalo-wzr-1166dhp-common.dtsi   | 192 ++++++++++++++++++
+ .../boot/dts/bcm4708-buffalo-wzr-1166dhp.dts  |  26 +++
+ .../boot/dts/bcm4708-buffalo-wzr-1166dhp2.dts |  26 +++
+ 4 files changed, 246 insertions(+)
+ create mode 100644 arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp-common.dtsi
+ create mode 100644 arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp.dts
+ create mode 100644 arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp2.dts
+
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -99,6 +99,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
+ 	bcm4708-asus-rt-ac56u.dtb \
+ 	bcm4708-asus-rt-ac68u.dtb \
+ 	bcm4708-buffalo-wzr-1750dhp.dtb \
++	bcm4708-buffalo-wzr-1166dhp.dtb \
++	bcm4708-buffalo-wzr-1166dhp2.dtb \
+ 	bcm4708-linksys-ea6300-v1.dtb \
+ 	bcm4708-linksys-ea6500-v2.dtb \
+ 	bcm4708-luxul-xap-1510.dtb \
+--- /dev/null
++++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp-common.dtsi
+@@ -0,0 +1,192 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
++/*
++ * Broadcom BCM470X / BCM5301X ARM platform code.
++ * DTS for Buffalo WZR-1166DHP and WZR-1166DHP2
++ *
++ * Copyright (C) 2014 Rafał Miłecki <[email protected]>
++ * Copyright (C) 2022 SHIMAMOTO Takayoshi <[email protected]>
++ */
++
++
++#include "bcm4708.dtsi"
++#include "bcm5301x-nand-cs0-bch8.dtsi"
++#include <dt-bindings/leds/common.h>
++
++/ {
++	spi {
++		compatible = "spi-gpio";
++		num-chipselects = <1>;
++		gpio-sck = <&chipcommon 7 0>;
++		gpio-mosi = <&chipcommon 4 0>;
++		cs-gpios = <&chipcommon 6 0>;
++		#address-cells = <1>;
++		#size-cells = <0>;
++
++		hc595: gpio_spi@0 {
++			compatible = "fairchild,74hc595";
++			reg = <0>;
++			registers-number = <1>;
++			spi-max-frequency = <100000>;
++
++			gpio-controller;
++			#gpio-cells = <2>;
++
++		};
++	};
++
++	leds {
++		compatible = "gpio-leds";
++
++		usb {
++			/* label = "bcm53xx:blue:usb"; */
++			function = LED_FUNCTION_USB;
++			color = <LED_COLOR_ID_BLUE>;
++			gpios = <&hc595 0 GPIO_ACTIVE_HIGH>;
++			trigger-sources = <&ohci_port1>, <&ehci_port1>,
++					  <&xhci_port1>, <&ohci_port2>,
++					  <&ehci_port2>;
++			linux,default-trigger = "usbport";
++		};
++
++		power0 {
++			/* label = "bcm53xx:red:power"; */
++			function = LED_FUNCTION_FAULT;
++			color = <LED_COLOR_ID_RED>;
++			gpios = <&hc595 1 GPIO_ACTIVE_HIGH>;
++		};
++
++		power1 {
++			/* label = "bcm53xx:white:power"; */
++			function = LED_FUNCTION_POWER;
++			color = <LED_COLOR_ID_WHITE>;
++			gpios = <&hc595 2 GPIO_ACTIVE_HIGH>;
++			linux,default-trigger = "default-on";
++		};
++
++		router0 {
++			/*  label = "bcm53xx:blue:router"; */
++			function = LED_FUNCTION_STATUS;
++			color = <LED_COLOR_ID_BLUE>;
++			gpios = <&hc595 3 GPIO_ACTIVE_HIGH>;
++			linux,default-trigger = "default-on";
++		};
++
++		router1 {
++			/* label = "bcm53xx:amber:router"; */
++			function = LED_FUNCTION_STATUS;
++			color = <LED_COLOR_ID_AMBER>;
++			gpios = <&hc595 4 GPIO_ACTIVE_HIGH>;
++		};
++
++		wan {
++			/* label = "bcm53xx:blue:wan"; */
++			function = LED_FUNCTION_WAN;
++			color = <LED_COLOR_ID_BLUE>;
++			gpios = <&hc595 5 GPIO_ACTIVE_HIGH>;
++			linux,default-trigger = "default-on";
++		};
++
++		wireless0 {
++			/* label = "bcm53xx:blue:wireless"; */
++			function = LED_FUNCTION_WLAN;
++			color = <LED_COLOR_ID_BLUE>;
++			gpios = <&hc595 6 GPIO_ACTIVE_HIGH>;
++		};
++
++		wireless1 {
++			/* label = "bcm53xx:amber:wireless"; */
++			function = LED_FUNCTION_WLAN;
++			color = <LED_COLOR_ID_AMBER>;
++			gpios = <&hc595 7 GPIO_ACTIVE_HIGH>;
++		};
++	};
++
++	gpio-keys {
++		compatible = "gpio-keys";
++
++		restart {
++			label = "Reset";
++			linux,code = <KEY_RESTART>;
++			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
++		};
++
++		aoss {
++			label = "AOSS";
++			linux,code = <KEY_WPS_BUTTON>;
++			gpios = <&chipcommon 12 GPIO_ACTIVE_LOW>;
++		};
++
++		/* Commit mode set by switch? */
++		mode {
++			label = "Mode";
++			linux,code = <KEY_SETUP>;
++			gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
++		};
++
++		/* Switch: AP mode */
++		sw_ap {
++			label = "AP";
++			linux,code = <BTN_0>;
++			gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
++		};
++
++		eject {
++			label = "USB eject";
++			linux,code = <KEY_EJECTCD>;
++			gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
++		};
++	};
++};
++
++&usb2 {
++	vcc-gpio = <&chipcommon 9 GPIO_ACTIVE_HIGH>;
++};
++
++&usb3 {
++	vcc-gpio = <&chipcommon 10 GPIO_ACTIVE_LOW>;
++};
++
++&spi_nor {
++	status = "okay";
++};
++
++&usb3_phy {
++	status = "okay";
++};
++
++&srab {
++	status = "okay";
++
++	ports {
++		port@0 {
++			reg = <0>;
++			label = "lan1";
++		};
++
++		port@1 {
++			reg = <1>;
++			label = "lan2";
++		};
++
++		port@2 {
++			reg = <2>;
++			label = "lan3";
++		};
++
++		port@3 {
++			reg = <3>;
++			label = "lan4";
++		};
++
++		port@4 {
++			reg = <4>;
++			label = "wan";
++		};
++
++		port@5 {
++			reg = <5>;
++			label = "cpu";
++			ethernet = <&gmac0>;
++		};
++	};
++};
+--- /dev/null
++++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp.dts
+@@ -0,0 +1,26 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
++/*
++ * Device Tree Bindigs for Buffalo WZR-1166DHP
++ *
++ * Copyright (C) 2022 SHIMAMOTO Takayoshi <[email protected]>
++ */
++
++/dts-v1/;
++
++#include "bcm4708-buffalo-wzr-1166dhp-common.dtsi"
++
++/ {
++	compatible = "buffalo,wzr-1166dhp", "brcm,bcm4708";
++	model = "Buffalo WZR-1166DHP";
++
++	chosen {
++		bootargs = "console=ttyS0,115200";
++	};
++
++	memory@0 {
++		device_type = "memory";
++		reg = <0x00000000 0x08000000>,
++		      <0x88000000 0x18000000>;
++	};
++
++};
+--- /dev/null
++++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp2.dts
+@@ -0,0 +1,26 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
++/*
++ * Device Tree Bindigs for Buffalo WZR-1166DHP2
++ *
++ * Copyright (C) 2022 SHIMAMOTO Takayoshi <[email protected]>
++ */
++
++/dts-v1/;
++
++#include "bcm4708-buffalo-wzr-1166dhp-common.dtsi"
++
++/ {
++	compatible = "buffalo,wzr-1166dhp2", "brcm,bcm4708";
++	model = "Buffalo WZR-1166DHP2";
++
++	chosen {
++		bootargs = "console=ttyS0,115200";
++	};
++
++	memory@0 {
++		device_type = "memory";
++		reg = <0x00000000 0x08000000>,
++		      <0x88000000 0x08000000>;
++	};
++
++};

target/linux/bcm53xx/patches-5.10/036-v5.19-0009-Revert-ARM-dts-BCM5301X-Fix-DTC-warning-for-NAND-nod.patch

@@ -0,0 +1,32 @@
+From 18176b9d82eebaf4408dc0440f54d57a8cbced83 Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <[email protected]>
+Date: Fri, 13 May 2022 11:11:07 +0200
+Subject: [PATCH] Revert "ARM: dts: BCM5301X: Fix DTC warning for NAND node"
+
+This reverts commit 90103611d573, which caused a new DTC warning
+
+arch/arm/boot/dts/bcm953012hr.dts:57.3-33: Warning (reg_format): /nand-controller@18028000/nand@0/partition@0:reg: property has invalid length (8 bytes) (#address-cells == 2, #size-cells == 1)
+arch/arm/boot/dts/bcm953012hr.dts:62.3-33: Warning (reg_format): /nand-controller@18028000/nand@0/partition@200000:reg: property has invalid length (8 bytes) (#address-cells == 2, #size-cells == 1)
+arch/arm/boot/dts/bcm953012hr.dts:66.3-33: Warning (reg_format): /nand-controller@18028000/nand@0/partition@600000:reg: property has invalid length (8 bytes) (#address-cells == 2, #size-cells == 1)
+arch/arm/boot/dts/bcm953012hr.dts:70.3-33: Warning (reg_format): /nand-controller@18028000/nand@0/partition@1000000:reg: property has invalid length (8 bytes) (#address-cells == 2, #size-cells == 1)
+arch/arm/boot/dts/bcm953012hr.dtb: Warning (pci_device_reg): Failed prerequisite 'reg_format'
+arch/arm/boot/dts/bcm953012hr.dtb: Warning (pci_device_bus_num): Failed prerequisite 'reg_format'
+arch/arm/boot/dts/bcm953012hr.dtb: Warning (i2c_bus_reg): Failed prerequisite 'reg_format'
+arch/arm/boot/dts/bcm953012hr.dtb: Warning (spi_bus_reg): Failed prerequisite 'reg_format'
+
+Signed-off-by: Arnd Bergmann <[email protected]>
+---
+ arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
++++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
+@@ -10,6 +10,8 @@
+ 		nandcs: nand@0 {
+ 			compatible = "brcm,nandcs";
+ 			reg = <0>;
++			#address-cells = <1>;
++			#size-cells = <1>;
+ 
+ 			partitions {
+ 				compatible = "brcm,bcm947xx-cfe-partitions";

target/linux/bcm53xx/patches-5.10/037-v6.0-0001-ARM-dts-broadcom-align-gpio-key-node-names-with-dtsc.patch

@@ -0,0 +1,912 @@
+From c5aec5611aec8fb1ca68f68e41acaefccfc93c16 Mon Sep 17 00:00:00 2001
+From: Krzysztof Kozlowski <[email protected]>
+Date: Thu, 9 Jun 2022 13:39:30 +0200
+Subject: [PATCH] ARM: dts: broadcom: align gpio-key node names with dtschema
+
+The node names should be generic and DT schema expects certain pattern
+(e.g. with key/button/switch).
+
+Signed-off-by: Krzysztof Kozlowski <[email protected]>
+Signed-off-by: Florian Fainelli <[email protected]>
+---
+ arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts          |  6 +++---
+ arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts          |  8 ++++----
+ .../boot/dts/bcm4708-buffalo-wzr-1166dhp-common.dtsi | 10 +++++-----
+ arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts    | 10 +++++-----
+ arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts      |  4 ++--
+ arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts      |  4 ++--
+ arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts         |  2 +-
+ arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts         |  2 +-
+ arch/arm/boot/dts/bcm4708-netgear-r6250.dts          |  6 +++---
+ arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts       |  6 +++---
+ arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts        |  6 +++---
+ arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts          |  4 ++--
+ arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts   |  8 ++++----
+ arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts    |  2 +-
+ arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts        |  2 +-
+ arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts        |  2 +-
+ arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts   |  4 ++--
+ arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts          |  4 ++--
+ arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts    | 12 ++++++------
+ arch/arm/boot/dts/bcm4709-linksys-ea9200.dts         |  4 ++--
+ arch/arm/boot/dts/bcm4709-netgear-r7000.dts          |  6 +++---
+ arch/arm/boot/dts/bcm4709-netgear-r8000.dts          |  8 ++++----
+ arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts    |  4 ++--
+ arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts         |  8 ++++----
+ arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts        |  6 +++---
+ arch/arm/boot/dts/bcm47094-linksys-panamera.dts      |  6 +++---
+ arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts        |  2 +-
+ arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts        |  2 +-
+ arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts        |  2 +-
+ arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts        |  2 +-
+ arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts        |  2 +-
+ arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts     |  2 +-
+ arch/arm/boot/dts/bcm47094-netgear-r8500.dts         |  8 ++++----
+ arch/arm/boot/dts/bcm47094-phicomm-k3.dts            |  2 +-
+ arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts        |  2 +-
+ arch/arm/boot/dts/bcm47189-luxul-xap-810.dts         |  2 +-
+ arch/arm/boot/dts/bcm47189-tenda-ac9.dts             |  6 +++---
+ arch/arm/boot/dts/bcm53016-meraki-mr32.dts           |  2 +-
+ arch/arm/boot/dts/bcm911360_entphn.dts               |  4 ++--
+ arch/arm/boot/dts/bcm947189acdbmr.dts                |  4 ++--
+ arch/arm/boot/dts/bcm953012er.dts                    |  4 ++--
+ arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi        |  2 +-
+ arch/arm/boot/dts/bcm958625-meraki-kingpin.dtsi      |  2 +-
+ 43 files changed, 97 insertions(+), 97 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
++++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
+@@ -70,19 +70,19 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		rfkill {
++		button-rfkill {
+ 			label = "WiFi";
+ 			linux,code = <KEY_RFKILL>;
+ 			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
++++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
+@@ -54,25 +54,25 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		brightness {
++		button-brightness {
+ 			label = "Backlight";
+ 			linux,code = <KEY_BRIGHTNESS_ZERO>;
+ 			gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		rfkill {
++		button-rfkill {
+ 			label = "WiFi";
+ 			linux,code = <KEY_RFKILL>;
+ 			gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp-common.dtsi
++++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp-common.dtsi
+@@ -104,33 +104,33 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		aoss {
++		button-aoss {
+ 			label = "AOSS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 12 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+ 		/* Commit mode set by switch? */
+-		mode {
++		button-mode {
+ 			label = "Mode";
+ 			linux,code = <KEY_SETUP>;
+ 			gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+ 		/* Switch: AP mode */
+-		sw_ap {
++		button-sw-ap {
+ 			label = "AP";
+ 			linux,code = <BTN_0>;
+ 			gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		eject {
++		button-eject {
+ 			label = "USB eject";
+ 			linux,code = <KEY_EJECTCD>;
+ 			gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
++++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
+@@ -100,33 +100,33 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		aoss {
++		button-aoss {
+ 			label = "AOSS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 12 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+ 		/* Commit mode set by switch? */
+-		mode {
++		button-mode {
+ 			label = "Mode";
+ 			linux,code = <KEY_SETUP>;
+ 			gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+ 		/* Switch: AP mode */
+-		sw_ap {
++		button-sw-ap {
+ 			label = "AP";
+ 			linux,code = <BTN_0>;
+ 			gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		eject {
++		button-eject {
+ 			label = "USB eject";
+ 			linux,code = <KEY_EJECTCD>;
+ 			gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
++++ b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
+@@ -29,13 +29,13 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts
++++ b/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts
+@@ -25,13 +25,13 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
++++ b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
+@@ -45,7 +45,7 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
++++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
+@@ -52,7 +52,7 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
++++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
+@@ -63,19 +63,19 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		rfkill {
++		button-rfkill {
+ 			label = "WiFi";
+ 			linux,code = <KEY_RFKILL>;
+ 			gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
++++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
+@@ -59,19 +59,19 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		rfkill {
++		button-rfkill {
+ 			label = "WiFi";
+ 			linux,code = <KEY_RFKILL>;
+ 			gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
++++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
+@@ -94,19 +94,19 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		rfkill {
++		button-rfkill {
+ 			label = "WiFi";
+ 			linux,code = <KEY_RFKILL>;
+ 			gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
++++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
+@@ -60,13 +60,13 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
++++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
+@@ -91,26 +91,26 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		aoss {
++		button-aoss {
+ 			label = "AOSS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 9 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+ 		/* Switch device mode? */
+-		mode {
++		button-mode {
+ 			label = "Mode";
+ 			linux,code = <KEY_SETUP>;
+ 			gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		eject {
++		button-eject {
+ 			label = "USB eject";
+ 			linux,code = <KEY_EJECTCD>;
+ 			gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
++++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
+@@ -96,7 +96,7 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
++++ b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
+@@ -45,7 +45,7 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
++++ b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
+@@ -94,7 +94,7 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
++++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
+@@ -77,13 +77,13 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		rfkill {
++		button-rfkill {
+ 			label = "WiFi";
+ 			linux,code = <KEY_RFKILL>;
+ 			gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
++++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
+@@ -50,13 +50,13 @@
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
++++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
+@@ -80,39 +80,39 @@
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
+ 
+-		power {
++		button-power {
+ 			label = "Power";
+ 			linux,code = <KEY_POWER>;
+ 			gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		aoss {
++		button-aoss {
+ 			label = "AOSS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 16 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+ 		/* Commit mode set by switch? */
+-		mode {
++		button-mode {
+ 			label = "Mode";
+ 			linux,code = <KEY_SETUP>;
+ 			gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+ 		/* Switch: AP mode */
+-		sw_ap {
++		button-sw-ap {
+ 			label = "AP";
+ 			linux,code = <BTN_0>;
+ 			gpios = <&chipcommon 18 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		eject {
++		button-eject {
+ 			label = "USB eject";
+ 			linux,code = <KEY_EJECTCD>;
+ 			gpios = <&chipcommon 20 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
++++ b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
+@@ -32,13 +32,13 @@
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
++++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
+@@ -75,19 +75,19 @@
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		rfkill {
++		button-rfkill {
+ 			label = "WiFi";
+ 			linux,code = <KEY_RFKILL>;
+ 			gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
++++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
+@@ -102,25 +102,25 @@
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
+ 
+-		rfkill {
++		button-rfkill {
+ 			label = "WiFi";
+ 			linux,code = <KEY_RFKILL>;
+ 			gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		brightness {
++		button-brightness {
+ 			label = "Backlight";
+ 			linux,code = <KEY_BRIGHTNESS_ZERO>;
+ 			gpios = <&chipcommon 19 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
++++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
+@@ -80,13 +80,13 @@
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts
++++ b/arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts
+@@ -72,25 +72,25 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 20 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		reset {
++		button-reset {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		wifi {
++		button-wifi {
+ 			label = "Wi-Fi";
+ 			linux,code = <KEY_RFKILL>;
+ 			gpios = <&chipcommon 18 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		led {
++		button-led {
+ 			label = "Backlight";
+ 			linux,code = <KEY_BRIGHTNESS_ZERO>;
+ 			gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
++++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
+@@ -86,20 +86,20 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+ 		/* Switch: router / extender */
+-		extender {
++		button-extender {
+ 			label = "Extender";
+ 			linux,code = <BTN_0>;
+ 			gpios = <&chipcommon 10 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
++++ b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
+@@ -30,19 +30,19 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		rfkill {
++		button-rfkill {
+ 				label = "WiFi";
+ 				linux,code = <KEY_RFKILL>;
+ 				gpios = <&chipcommon 16 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		reset {
++		button-reset {
+ 				label = "Reset";
+ 				linux,code = <KEY_RESTART>;
+ 				gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
++++ b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
+@@ -49,7 +49,7 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts
++++ b/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts
+@@ -43,7 +43,7 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
++++ b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
+@@ -49,7 +49,7 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts
++++ b/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts
+@@ -37,7 +37,7 @@
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 19 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
++++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
+@@ -89,7 +89,7 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts
++++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts
+@@ -67,7 +67,7 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
++++ b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
+@@ -65,25 +65,25 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		brightness {
++		button-brightness {
+ 			label = "Backlight";
+ 			linux,code = <KEY_BRIGHTNESS_ZERO>;
+ 			gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 10 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		rfkill {
++		button-rfkill {
+ 			label = "WiFi";
+ 			linux,code = <KEY_RFKILL>;
+ 			gpios = <&chipcommon 20 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47094-phicomm-k3.dts
++++ b/arch/arm/boot/dts/bcm47094-phicomm-k3.dts
+@@ -22,7 +22,7 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
++++ b/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
+@@ -39,7 +39,7 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
++++ b/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
+@@ -49,7 +49,7 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47189-tenda-ac9.dts
++++ b/arch/arm/boot/dts/bcm47189-tenda-ac9.dts
+@@ -59,19 +59,19 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		rfkill {
++		button-rfkill {
+ 			label = "WiFi";
+ 			linux,code = <KEY_RFKILL>;
+ 			gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 9 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm53016-meraki-mr32.dts
++++ b/arch/arm/boot/dts/bcm53016-meraki-mr32.dts
+@@ -50,7 +50,7 @@
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 21 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm911360_entphn.dts
++++ b/arch/arm/boot/dts/bcm911360_entphn.dts
+@@ -47,10 +47,10 @@
+ 		stdout-path = "serial0:115200n8";
+ 	};
+ 
+-	gpio_keys {
++	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		hook {
++		button-hook {
+ 			label = "HOOK";
+ 			linux,code = <KEY_O>;
+ 			gpios = <&gpio_asiu 48 0>;
+--- a/arch/arm/boot/dts/bcm947189acdbmr.dts
++++ b/arch/arm/boot/dts/bcm947189acdbmr.dts
+@@ -44,13 +44,13 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 7 GPIO_ACTIVE_HIGH>;
+ 		};
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 9 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm953012er.dts
++++ b/arch/arm/boot/dts/bcm953012er.dts
+@@ -47,13 +47,13 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi
++++ b/arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi
+@@ -13,7 +13,7 @@
+ 		autorepeat;
+ 		poll-interval = <20>;
+ 
+-		reset {
++		button-reset {
+ 			label = "reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&gpioa 8 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm958625-meraki-kingpin.dtsi
++++ b/arch/arm/boot/dts/bcm958625-meraki-kingpin.dtsi
+@@ -14,7 +14,7 @@
+ 		autorepeat;
+ 		poll-interval = <20>;
+ 
+-		reset {
++		button-reset {
+ 			label = "reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&gpioa 6 GPIO_ACTIVE_LOW>;

target/linux/bcm53xx/patches-5.10/037-v6.0-0002-ARM-dts-broadcom-correct-gpio-keys-properties.patch

@@ -0,0 +1,108 @@
+From d634a6969c03803a945fdc2bccbe7d813420e569 Mon Sep 17 00:00:00 2001
+From: Krzysztof Kozlowski <[email protected]>
+Date: Thu, 9 Jun 2022 13:39:31 +0200
+Subject: [PATCH] ARM: dts: broadcom: correct gpio-keys properties
+
+gpio-keys children do not use unit addresses.
+
+Signed-off-by: Krzysztof Kozlowski <[email protected]>
+Signed-off-by: Florian Fainelli <[email protected]>
+---
+ arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts       | 2 --
+ arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 2 --
+ arch/arm/boot/dts/bcm4709-linksys-ea9200.dts      | 2 --
+ arch/arm/boot/dts/bcm4709-netgear-r7000.dts       | 2 --
+ arch/arm/boot/dts/bcm4709-netgear-r8000.dts       | 2 --
+ arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 2 --
+ arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts     | 2 --
+ arch/arm/boot/dts/bcm53016-meraki-mr32.dts        | 2 --
+ 8 files changed, 16 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
++++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
+@@ -47,8 +47,6 @@
+ 
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+ 
+ 		button-wps {
+ 			label = "WPS";
+--- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
++++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
+@@ -77,8 +77,6 @@
+ 
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+ 
+ 		button-power {
+ 			label = "Power";
+--- a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
++++ b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
+@@ -29,8 +29,6 @@
+ 
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+ 
+ 		button-wps {
+ 			label = "WPS";
+--- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
++++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
+@@ -72,8 +72,6 @@
+ 
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+ 
+ 		button-wps {
+ 			label = "WPS";
+--- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
++++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
+@@ -99,8 +99,6 @@
+ 
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+ 
+ 		button-rfkill {
+ 			label = "WiFi";
+--- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
++++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
+@@ -77,8 +77,6 @@
+ 
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+ 
+ 		button-wps {
+ 			label = "WPS";
+--- a/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts
++++ b/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts
+@@ -34,8 +34,6 @@
+ 
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+ 
+ 		button-restart {
+ 			label = "Reset";
+--- a/arch/arm/boot/dts/bcm53016-meraki-mr32.dts
++++ b/arch/arm/boot/dts/bcm53016-meraki-mr32.dts
+@@ -47,8 +47,6 @@
+ 
+ 	keys {
+ 		compatible = "gpio-keys";
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+ 
+ 		button-restart {
+ 			label = "Reset";

target/linux/bcm53xx/patches-5.10/038-v6.1-0001-ARM-dts-BCM5301X-Correct-description-of-TP-Link-part.patch

@@ -0,0 +1,99 @@
+From c8ee9f119bfb4244f76c9971c341ec06b49332cd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <[email protected]>
+Date: Tue, 8 Nov 2022 12:07:08 +0100
+Subject: [PATCH] ARM: dts: BCM5301X: Correct description of TP-Link partitions
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+TP-Link routers have flash space partitioned according to the partitions
+table. It may look like fixed partitioning but those partitions can be
+actually reorganized. New can be added (or some removed), offsets and
+sizes may change.
+
+Fix DT to use binding for the TP-Link SafeLoader partitioning method.
+
+Signed-off-by: Rafał Miłecki <[email protected]>
+Link: https://lore.kernel.org/r/[email protected]
+Signed-off-by: Florian Fainelli <[email protected]>
+---
+ .../boot/dts/bcm47081-tplink-archer-c5-v2.dts | 25 ++++---------------
+ .../boot/dts/bcm4709-tplink-archer-c9-v1.dts  | 25 ++++---------------
+ 2 files changed, 10 insertions(+), 40 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
++++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
+@@ -95,30 +95,15 @@
+ 	status = "okay";
+ 
+ 	partitions {
+-		compatible = "fixed-partitions";
+-		#address-cells = <1>;
+-		#size-cells = <1>;
++		compatible = "tplink,safeloader-partitions";
++		partitions-table-offset = <0xe50000>;
+ 
+-		boot@0 {
+-			label = "boot";
+-			reg = <0x000000 0x040000>;
+-			read-only;
+-		};
+-
+-		os-image@100000 {
+-			label = "os-image";
+-			reg = <0x040000 0x200000>;
++		partition-os-image {
+ 			compatible = "brcm,trx";
+ 		};
+ 
+-		rootfs@240000 {
+-			label = "rootfs";
+-			reg = <0x240000 0xc00000>;
+-		};
+-
+-		nvram@ff0000 {
+-			label = "nvram";
+-			reg = <0xff0000 0x010000>;
++		partition-file-system {
++			linux,rootfs;
+ 		};
+ 	};
+ };
+--- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
++++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
+@@ -104,30 +104,15 @@
+ 	status = "okay";
+ 
+ 	partitions {
+-		compatible = "fixed-partitions";
+-		#address-cells = <1>;
+-		#size-cells = <1>;
++		compatible = "tplink,safeloader-partitions";
++		partitions-table-offset = <0xe50000>;
+ 
+-		boot@0 {
+-			label = "boot";
+-			reg = <0x000000 0x040000>;
+-			read-only;
+-		};
+-
+-		os-image@100000 {
+-			label = "os-image";
+-			reg = <0x040000 0x200000>;
++		partition-os-image {
+ 			compatible = "brcm,trx";
+ 		};
+ 
+-		rootfs@240000 {
+-			label = "rootfs";
+-			reg = <0x240000 0xc00000>;
+-		};
+-
+-		nvram@ff0000 {
+-			label = "nvram";
+-			reg = <0xff0000 0x010000>;
++		partition-file-system {
++			linux,rootfs;
+ 		};
+ 	};
+ };

target/linux/bcm53xx/patches-5.10/038-v6.1-0001-ARM-dts-bcm47094-Add-devicetree-for-D-Link-DIR-890L.patch

@@ -0,0 +1,242 @@
+From b1ba87897ceda8e49a47aa92832dd7bff8583e21 Mon Sep 17 00:00:00 2001
+From: Linus Walleij <[email protected]>
+Date: Mon, 7 Nov 2022 14:41:04 +0100
+Subject: [PATCH] ARM: dts: bcm47094: Add devicetree for D-Link DIR-890L
+
+This adds a device tree for the D-Link DIR-890L. This device
+is very similar to D-Link DIR-885L, the differences are detailed
+as a comment in the DTS file.
+
+Signed-off-by: Linus Walleij <[email protected]>
+Link: https://lore.kernel.org/r/[email protected]
+Signed-off-by: Florian Fainelli <[email protected]>
+---
+ arch/arm/boot/dts/Makefile                    |   1 +
+ arch/arm/boot/dts/bcm47094-dlink-dir-890l.dts | 211 ++++++++++++++++++
+ 2 files changed, 212 insertions(+)
+ create mode 100644 arch/arm/boot/dts/bcm47094-dlink-dir-890l.dts
+
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -122,6 +122,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
+ 	bcm4709-tplink-archer-c9-v1.dtb \
+ 	bcm47094-asus-rt-ac88u.dtb \
+ 	bcm47094-dlink-dir-885l.dtb \
++	bcm47094-dlink-dir-890l.dtb \
+ 	bcm47094-linksys-panamera.dtb \
+ 	bcm47094-luxul-abr-4500.dtb \
+ 	bcm47094-luxul-xap-1610.dtb \
+--- /dev/null
++++ b/arch/arm/boot/dts/bcm47094-dlink-dir-890l.dts
+@@ -0,0 +1,211 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
++/*
++ * Device tree for D-Link DIR-890L
++ * D-Link calls this board "WRGAC36"
++ * this router has the same looks and form factor as D-Link DIR-885L.
++ *
++ * Some differences from DIR-885L include a separate USB2 port, separate LEDs
++ * for USB2 and USB3, a separate VCC supply for the USB2 slot and no
++ * router/extender switch is mounted (there is an empty mount point on the
++ * PCB) so this device is a pure router. Also the LAN ports are in the right
++ * order.
++ *
++ * Based on the device tree for DIR-885L
++ * Copyright (C) 2016 Rafał Miłecki <[email protected]>
++ * Copyright (C) 2022 Linus Walleij
++ */
++
++/dts-v1/;
++
++#include "bcm47094.dtsi"
++#include "bcm5301x-nand-cs0-bch1.dtsi"
++
++/ {
++	compatible = "dlink,dir-890l", "brcm,bcm47094", "brcm,bcm4708";
++	model = "D-Link DIR-890L";
++
++	chosen {
++		bootargs = "console=ttyS0,115200 earlycon";
++	};
++
++	memory@0 {
++		device_type = "memory";
++		reg = <0x00000000 0x08000000>,
++		      <0x88000000 0x08000000>;
++	};
++
++	leds {
++		/*
++		 * LED information is derived from the boot log which
++		 * conveniently lists all the LEDs.
++		 */
++		compatible = "gpio-leds";
++
++		power-white {
++			label = "bcm53xx:white:power";
++			gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
++			linux,default-trigger = "default-on";
++		};
++
++		wan-white {
++			label = "bcm53xx:white:wan";
++			gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
++		};
++
++		power-amber {
++			label = "bcm53xx:amber:power";
++			gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
++		};
++
++		wan-amber {
++			label = "bcm53xx:amber:wan";
++			gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
++		};
++
++		usb3-white {
++			label = "bcm53xx:white:usb3";
++			gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>;
++			trigger-sources = <&xhci_port1>;
++			linux,default-trigger = "usbport";
++		};
++
++		usb2-white {
++			label = "bcm53xx:white:usb2";
++			gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
++			trigger-sources = <&ohci_port1>, <&ehci_port1>;
++			linux,default-trigger = "usbport";
++		};
++
++		2ghz {
++			label = "bcm53xx:white:2ghz";
++			gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
++		};
++
++		5ghz {
++			label = "bcm53xx:white:5ghz";
++			gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
++		};
++	};
++
++	gpio-keys {
++		compatible = "gpio-keys";
++
++		button-wps {
++			label = "WPS";
++			linux,code = <KEY_WPS_BUTTON>;
++			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
++		};
++
++		/* Called "factory reset" in the vendor dmesg */
++		button-restart {
++			label = "Reset";
++			linux,code = <KEY_RESTART>;
++			gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
++		};
++	};
++
++	/*
++	 * The flash memory is memory mapped at 0x1e000000-0x1fffffff
++	 * 64KB blocks; total size 2MB, same that can be
++	 * found attached to the spi_nor SPI controller.
++	 */
++	nvram@1e1f0000 {
++		compatible = "brcm,nvram";
++		reg = <0x1e1f0000 0x00010000>;
++
++		et0macaddr: et0macaddr {
++		};
++	};
++};
++
++&gmac2 {
++	/*
++	 * The NVRAM curiously does not contain a MAC address
++	 * for et2 so since that is the only ethernet interface
++	 * actually in use on the platform, we use this et0 MAC
++	 * address for et2.
++	 */
++	nvmem-cells = <&et0macaddr>;
++	nvmem-cell-names = "mac-address";
++};
++
++&spi_nor {
++	status = "okay";
++};
++
++&nandcs {
++	/* Spansion S34ML01G2, 128MB with 128KB erase blocks */
++	partitions {
++		compatible = "fixed-partitions";
++		#address-cells = <1>;
++		#size-cells = <1>;
++
++		/*
++		 * This is called "nflash" in the vendor kernel with
++		 * "upgrade" and "rootfs" (probably using OpenWrt
++		 * splitpart). We call it "firmware" like standard tools
++		 * assume. The CFE loader contains incorrect information
++		 * about TRX partitions, ignore this, there are no TRX
++		 * partitions: this device uses SEAMA.
++		 */
++		firmware@0 {
++			label = "firmware";
++			reg = <0x00000000 0x08000000>;
++		};
++	};
++};
++
++&usb2 {
++	vcc-gpios = <&chipcommon 21 GPIO_ACTIVE_HIGH>;
++};
++
++&usb3 {
++	vcc-gpios = <&chipcommon 18 GPIO_ACTIVE_HIGH>;
++};
++
++&usb3_phy {
++	status = "okay";
++};
++
++&srab {
++	status = "okay";
++
++	ports {
++		port@0 {
++			reg = <0>;
++			label = "lan1";
++		};
++
++		port@1 {
++			reg = <1>;
++			label = "lan2";
++		};
++
++		port@2 {
++			reg = <2>;
++			label = "lan3";
++		};
++
++		port@3 {
++			reg = <3>;
++			label = "lan4";
++		};
++
++		port@4 {
++			reg = <4>;
++			label = "wan";
++		};
++
++		port@8 {
++			reg = <8>;
++			label = "cpu";
++			ethernet = <&gmac2>;
++			phy-mode = "rgmii";
++
++			fixed-link {
++				speed = <1000>;
++				full-duplex;
++			};
++		};
++	};
++};

target/linux/bcm53xx/patches-5.10/038-v6.1-0001-ARM-dts-bcm53016-Add-devicetree-for-D-Link-DWL-8610A.patch

@@ -0,0 +1,165 @@
+From 9f66e1dd82e3186aee95282657512ca2aef1afe0 Mon Sep 17 00:00:00 2001
+From: Linus Walleij <[email protected]>
+Date: Wed, 19 Oct 2022 21:34:49 +0200
+Subject: [PATCH] ARM: dts: bcm53016: Add devicetree for D-Link DWL-8610AP
+
+This adds a device tree for the BCM53016-based D-Link DWL-8610AP
+access point wireless router.
+
+The TRX-format partitions had to be named "firmware" due to
+an OpenWrt patch that only accepts parting such nodes if they
+are named "firmware".
+
+Signed-off-by: Linus Walleij <[email protected]>
+Link: https://lore.kernel.org/r/[email protected]
+Signed-off-by: Florian Fainelli <[email protected]>
+---
+ arch/arm/boot/dts/Makefile                    |   1 +
+ .../boot/dts/bcm53016-dlink-dwl-8610ap.dts    | 131 ++++++++++++++++++
+ 2 files changed, 132 insertions(+)
+ create mode 100644 arch/arm/boot/dts/bcm53016-dlink-dwl-8610ap.dts
+
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -133,6 +133,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
+ 	bcm47094-netgear-r8500.dtb \
+ 	bcm47094-phicomm-k3.dtb \
+ 	bcm53015-meraki-mr26.dtb \
++	bcm53016-dlink-dwl-8610ap.dtb \
+ 	bcm53016-meraki-mr32.dtb \
+ 	bcm94708.dtb \
+ 	bcm94709.dtb \
+--- /dev/null
++++ b/arch/arm/boot/dts/bcm53016-dlink-dwl-8610ap.dts
+@@ -0,0 +1,131 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
++/dts-v1/;
++
++#include "bcm4709.dtsi"
++#include "bcm5301x-nand-cs0-bch8.dtsi"
++#include <dt-bindings/leds/common.h>
++#include <dt-bindings/input/input.h>
++
++/ {
++	model = "D-Link DWL-8610AP";
++	compatible = "dlink,dwl-8610ap", "brcm,bcm53016", "brcm,bcm4708";
++
++	memory@0 {
++		device_type = "memory";
++		/* 512 MB RAM in 2 x Macronix D9PSH chips */
++		reg = <0x00000000 0x08000000>,
++		      <0x88000000 0x08000000>;
++	};
++
++	leds {
++		compatible = "gpio-leds";
++
++		power {
++			function = LED_FUNCTION_POWER;
++			color = <LED_COLOR_ID_GREEN>;
++			gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
++			default-state = "on";
++		};
++
++		diag {
++			/* Actually "diag" unclear what this means */
++			function = LED_FUNCTION_INDICATOR;
++			color = <LED_COLOR_ID_RED>;
++			gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
++			default-state = "on";
++			linux,default-trigger = "heartbeat";
++		};
++
++		wlan-2g {
++			function = LED_FUNCTION_WLAN;
++			color = <LED_COLOR_ID_GREEN>;
++			gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;
++		};
++
++		wlan-5g {
++			function = LED_FUNCTION_WLAN;
++			color = <LED_COLOR_ID_GREEN>;
++			gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>;
++		};
++	};
++
++	gpio_keys {
++		compatible = "gpio-keys";
++
++		button-reset {
++			debounce-interval = <100>;
++			wakeup-source;
++			linux,code = <KEY_RESTART>;
++			label = "reset";
++			/* This GPIO is actually stored in NVRAM, but it's not gonna change */
++			gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
++		};
++	};
++
++	/*
++	 * Flash memory at 0x1e000000-0x1fffffff
++	 * Macronix 32 64KB blocks; total size 2MB, same that can be
++	 * found attached to the spi_nor SPI controller.
++	 */
++	nvram@1e080000 {
++		compatible = "brcm,nvram";
++		reg = <0x1e080000 0x00020000>;
++
++		et0macaddr: et0macaddr {
++		};
++
++		et1macaddr: et1macaddr {
++		};
++	};
++};
++
++&gmac0 {
++	nvmem-cells = <&et0macaddr>;
++	nvmem-cell-names = "mac-address";
++};
++
++&gmac1 {
++	nvmem-cells = <&et1macaddr>;
++	nvmem-cell-names = "mac-address";
++};
++
++&spi_nor {
++	/* Serial SPI NOR Flash MX 25L1606E */
++	status = "okay";
++};
++
++&nandcs {
++	/*
++	 * Spansion S34ML01G100TFI00 128 MB NAND Flash memory
++	 *
++	 * This ECC is a bit unorthodox but it is what the stock firmware
++	 * is using, so to be able to mount the original partitions
++	 * this is necessary.
++	 */
++	nand-ecc-strength = <5>;
++	partitions {
++		compatible = "fixed-partitions";
++		#address-cells = <1>;
++		#size-cells = <1>;
++
++		/* This is named nflash1.trx in CFE */
++		trx@0 {
++			label = "firmware";
++			reg = <0x00000000 0x02800000>;
++			compatible = "brcm,trx";
++		};
++
++		/* This is named nflash1.trx2 in CFE */
++		trx2@2800000 {
++			label = "firmware2";
++			reg = <0x02800000 0x02800000>;
++			compatible = "brcm,trx";
++		};
++
++		/* This is named nflash1.rwfs in CFE */
++		free@5000000 {
++			label = "free";
++			reg = <0x05000000 0x03000000>;
++		};
++	};
++};

target/linux/bcm53xx/patches-5.10/304-ARM-dts-BCM5301X-Specify-switch-ports-for-remaining-.patch

@@ -311,7 +311,7 @@ Signed-off-by: Rafał Miłecki <[email protected]>
 +};
 --- a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
 +++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
-@@ -68,6 +68,38 @@
+@@ -66,6 +66,38 @@
  	status = "okay";
  };
  
@@ -352,7 +352,7 @@ Signed-off-by: Rafał Miłecki <[email protected]>
  		compatible = "fixed-partitions";
 --- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
 +++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
-@@ -132,3 +132,40 @@
+@@ -130,3 +130,40 @@
  &usb3_phy {
  	status = "okay";
  };
@@ -395,7 +395,7 @@ Signed-off-by: Rafał Miłecki <[email protected]>
 +};
 --- a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
 +++ b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
-@@ -49,3 +49,45 @@
+@@ -47,3 +47,45 @@
  &usb3_phy {
  	status = "okay";
  };
@@ -443,7 +443,7 @@ Signed-off-by: Rafał Miłecki <[email protected]>
 +};
 --- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
 +++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
-@@ -106,3 +106,40 @@
+@@ -104,3 +104,40 @@
  &usb3_phy {
  	status = "okay";
  };
@@ -621,7 +621,7 @@ Signed-off-by: Rafał Miłecki <[email protected]>
  
 --- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
 +++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
-@@ -102,6 +102,43 @@
+@@ -100,6 +100,43 @@
  	vcc-gpio = <&chipcommon 12 GPIO_ACTIVE_HIGH>;
  };
  

target/linux/bcm53xx/patches-5.10/310-ARM-BCM5301X-Add-DT-for-Netgear-R7900.patch

@@ -9,7 +9,7 @@ Signed-off-by: Rafał Miłecki <[email protected]>
 
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -116,6 +116,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
+@@ -118,6 +118,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
  	bcm4709-buffalo-wxr-1900dhp.dtb \
  	bcm4709-linksys-ea9200.dtb \
  	bcm4709-netgear-r7000.dtb \

target/linux/bcm53xx/patches-5.15/033-v5.19-0002-ARM-dts-BCM5301X-Fix-DTC-warning-for-NAND-node.patch

@@ -0,0 +1,31 @@
+From 90103611d573c5c238350f9b1d7cb682c62f5681 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= <[email protected]>
+Date: Fri, 1 Apr 2022 13:19:58 +0300
+Subject: [PATCH] ARM: dts: BCM5301X: Fix DTC warning for NAND node
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Remove the unnecessary #address-cells and #size-cells properties on the
+nand@0 node to fix the warning below.
+
+Warning (avoid_unnecessary_addr_size): /nand-controller@18028000/nand@0: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
+
+Signed-off-by: Arınç ÜNAL <[email protected]>
+Acked-by: Rafał Miłecki <[email protected]>
+Signed-off-by: Florian Fainelli <[email protected]>
+---
+ arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi | 2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
++++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
+@@ -10,8 +10,6 @@
+ 		nandcs: nand@0 {
+ 			compatible = "brcm,nandcs";
+ 			reg = <0>;
+-			#address-cells = <1>;
+-			#size-cells = <1>;
+ 
+ 			partitions {
+ 				compatible = "brcm,bcm947xx-cfe-partitions";

target/linux/bcm53xx/patches-5.15/033-v5.19-0003-ARM-dts-BCM5301X-Remove-cell-properties-from-srab-po.patch

@@ -0,0 +1,40 @@
+From e5ff0a7aab3ef5dd8ec7636b936c95179aa5ddfa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= <[email protected]>
+Date: Fri, 1 Apr 2022 13:19:59 +0300
+Subject: [PATCH] ARM: dts: BCM5301X: Remove cell properties from srab ports on
+ Asus RT-AC88U
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Remove #address-cells and #size-cells properties from the ports node of
+&srab. They are already defined on bcm5301x.dtsi, there's no need to define
+them again.
+
+Signed-off-by: Arınç ÜNAL <[email protected]>
+Acked-by: Rafał Miłecki <[email protected]>
+Signed-off-by: Florian Fainelli <[email protected]>
+---
+ arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts
++++ b/arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts
+@@ -1,6 +1,6 @@
+ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+ /*
+- * Copyright (C) 2021 Arınç ÜNAL <[email protected]>
++ * Copyright (C) 2021-2022 Arınç ÜNAL <[email protected]>
+  */
+ 
+ /dts-v1/;
+@@ -177,9 +177,6 @@
+ 	dsa,member = <0 0>;
+ 
+ 	ports {
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+-
+ 		port@0 {
+ 			reg = <0>;
+ 			label = "lan4";

target/linux/bcm53xx/patches-5.15/033-v5.19-0004-ARM-dts-BCM5301X-Add-rgmii-to-port-5-of-Broadcom-swi.patch

@@ -0,0 +1,29 @@
+From 4b7a67420a34ebd8fbf0111221a8bfd8001d418d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= <[email protected]>
+Date: Fri, 1 Apr 2022 13:20:00 +0300
+Subject: [PATCH] ARM: dts: BCM5301X: Add rgmii to port@5 of Broadcom switch on
+ Asus RT-AC88U
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Define phy-mode of the Broadcom switch's port@5 as rgmii. This doesn't seem
+to matter but let's explicitly define it since phy-mode as rgmii is defined
+on the other side which is port@6 of the Realtek switch.
+
+Signed-off-by: Arınç ÜNAL <[email protected]>
+Signed-off-by: Florian Fainelli <[email protected]>
+---
+ arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts
++++ b/arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts
+@@ -205,6 +205,7 @@
+ 		sw0_p5: port@5 {
+ 			reg = <5>;
+ 			label = "extsw";
++			phy-mode = "rgmii";
+ 
+ 			fixed-link {
+ 				speed = <1000>;

target/linux/bcm53xx/patches-5.15/033-v5.19-0005-ARM-dts-BCM5301X-Retrieve-gmac1-MAC-address-from-NVR.patch

@@ -0,0 +1,43 @@
+From 7f7f8c7b9f3cbae1355fb3b0ce4ea9d6f1552521 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= <[email protected]>
+Date: Fri, 1 Apr 2022 13:20:01 +0300
+Subject: [PATCH] ARM: dts: BCM5301X: Retrieve gmac1 MAC address from NVRAM on
+ Asus RT-AC88U
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The et1macaddr NVRAM variable contains a MAC address for gmac1 on Asus
+RT-AC88U. Add NVMEM cell for it and reference it in the gmac1 node.
+
+Signed-off-by: Arınç ÜNAL <[email protected]>
+Acked-by: Rafał Miłecki <[email protected]>
+Signed-off-by: Florian Fainelli <[email protected]>
+---
+ arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts
++++ b/arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts
+@@ -25,6 +25,9 @@
+ 	nvram@1c080000 {
+ 		compatible = "brcm,nvram";
+ 		reg = <0x1c080000 0x00180000>;
++
++		et1macaddr: et1macaddr {
++		};
+ 	};
+ 
+ 	leds {
+@@ -239,6 +242,11 @@
+ 	};
+ };
+ 
++&gmac1 {
++	nvmem-cells = <&et1macaddr>;
++	nvmem-cell-names = "mac-address";
++};
++
+ &usb2 {
+ 	vcc-gpio = <&chipcommon 9 GPIO_ACTIVE_HIGH>;
+ };

target/linux/bcm53xx/patches-5.15/033-v5.19-0006-ARM-dts-BCM5301X-Fix-compatible-strings-for-BCM53012.patch

@@ -0,0 +1,65 @@
+From 69bb5c6f3f41fe6baa86a775c8a3e69dd27f85d6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= <[email protected]>
+Date: Sat, 2 Apr 2022 23:46:21 +0300
+Subject: [PATCH] ARM: dts: BCM5301X: Fix compatible strings for BCM53012 and
+ BCM53016 SoC
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix compatible strings for devicetrees using the BCM53012 and BCM53016 SoC.
+
+Signed-off-by: Arınç ÜNAL <[email protected]>
+Acked-by: Krzysztof Kozlowski <[email protected]>
+Signed-off-by: Florian Fainelli <[email protected]>
+---
+ arch/arm/boot/dts/bcm53016-meraki-mr32.dts | 2 +-
+ arch/arm/boot/dts/bcm953012er.dts          | 2 +-
+ arch/arm/boot/dts/bcm953012hr.dts          | 2 +-
+ arch/arm/boot/dts/bcm953012k.dts           | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm53016-meraki-mr32.dts
++++ b/arch/arm/boot/dts/bcm53016-meraki-mr32.dts
+@@ -13,7 +13,7 @@
+ #include <dt-bindings/leds/common.h>
+ 
+ / {
+-	compatible = "meraki,mr32", "brcm,brcm53016", "brcm,bcm4708";
++	compatible = "meraki,mr32", "brcm,bcm53016", "brcm,bcm4708";
+ 	model = "Meraki MR32";
+ 
+ 	chosen {
+--- a/arch/arm/boot/dts/bcm953012er.dts
++++ b/arch/arm/boot/dts/bcm953012er.dts
+@@ -37,7 +37,7 @@
+ 
+ / {
+ 	model = "NorthStar Enterprise Router (BCM953012ER)";
+-	compatible = "brcm,bcm953012er", "brcm,brcm53012", "brcm,bcm4708";
++	compatible = "brcm,bcm953012er", "brcm,bcm53012", "brcm,bcm4708";
+ 
+ 	memory@0 {
+ 		device_type = "memory";
+--- a/arch/arm/boot/dts/bcm953012hr.dts
++++ b/arch/arm/boot/dts/bcm953012hr.dts
+@@ -37,7 +37,7 @@
+ 
+ / {
+ 	model = "NorthStar HR (BCM953012HR)";
+-	compatible = "brcm,bcm953012hr", "brcm,brcm53012", "brcm,bcm4708";
++	compatible = "brcm,bcm953012hr", "brcm,bcm53012", "brcm,bcm4708";
+ 
+ 	aliases {
+ 		ethernet0 = &gmac0;
+--- a/arch/arm/boot/dts/bcm953012k.dts
++++ b/arch/arm/boot/dts/bcm953012k.dts
+@@ -36,7 +36,7 @@
+ 
+ / {
+ 	model = "NorthStar SVK (BCM953012K)";
+-	compatible = "brcm,bcm953012k", "brcm,brcm53012", "brcm,bcm4708";
++	compatible = "brcm,bcm953012k", "brcm,bcm53012", "brcm,bcm4708";
+ 
+ 	aliases {
+ 		serial0 = &uart0;

target/linux/bcm53xx/patches-5.15/033-v5.19-0007-ARM-dts-BCM5301X-Disable-gmac0-and-enable-port-8-on-.patch

@@ -0,0 +1,39 @@
+From b9cff8783439ff1803709128af3a0e04c5f5f047 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= <[email protected]>
+Date: Sun, 10 Apr 2022 12:44:55 +0300
+Subject: [PATCH] ARM: dts: BCM5301X: Disable gmac0 and enable port@8 on Asus
+ RT-AC88U
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Disable gmac0 which is not connected to any switch MAC. Enable port@8 of
+the Broadcom switch which is connected to gmac2.
+
+Signed-off-by: Arınç ÜNAL <[email protected]>
+Signed-off-by: Florian Fainelli <[email protected]>
+---
+ arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts
++++ b/arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts
+@@ -232,7 +232,6 @@
+ 			reg = <8>;
+ 			ethernet = <&gmac2>;
+ 			label = "cpu";
+-			status = "disabled";
+ 
+ 			fixed-link {
+ 				speed = <1000>;
+@@ -242,6 +241,10 @@
+ 	};
+ };
+ 
++&gmac0 {
++	status = "disabled";
++};
++
+ &gmac1 {
+ 	nvmem-cells = <&et1macaddr>;
+ 	nvmem-cell-names = "mac-address";

target/linux/bcm53xx/patches-5.15/033-v5.19-0008-ARM-dts-BCM5301X-Add-DT-for-WZR-1166DHP-DHP2.patch

@@ -0,0 +1,300 @@
+From 417aea4436bb658d8c5c4dcd0e3c255931d0ee96 Mon Sep 17 00:00:00 2001
+From: SHIMAMOTO Takayoshi <[email protected]>
+Date: Fri, 22 Apr 2022 00:10:54 +0900
+Subject: [PATCH] ARM: dts: BCM5301X: Add DT for WZR-1166DHP,DHP2
+
+Buffalo WZR-1166DHP/WZR-1166DHP2  wireless router with
+
+    - BCM4708A0
+    - 128MiB NAND flash
+    - 2T2R 11ac/a/b/g/n Wi-Fi
+    - 4x 10/100/1000M ethernet switch
+    - 1x USB 3.0 port
+
+  WZR-1166DHP and WZR-1166DHP2 have different memory capacity.
+
+  WZR-1166DHP
+    - 512 MiB DDR2 SDRAM
+
+  WZR-1166DHP2
+    - 256 MiB DDR2 SDRAM
+
+  These hardware components are very similar to the WZR-1750DHP
+   except for the number of antennas.
+
+Signed-off-by: SHIMAMOTO Takayoshi <[email protected]>
+Signed-off-by: Florian Fainelli <[email protected]>
+---
+ arch/arm/boot/dts/Makefile                    |   2 +
+ .../bcm4708-buffalo-wzr-1166dhp-common.dtsi   | 192 ++++++++++++++++++
+ .../boot/dts/bcm4708-buffalo-wzr-1166dhp.dts  |  26 +++
+ .../boot/dts/bcm4708-buffalo-wzr-1166dhp2.dts |  26 +++
+ 4 files changed, 246 insertions(+)
+ create mode 100644 arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp-common.dtsi
+ create mode 100644 arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp.dts
+ create mode 100644 arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp2.dts
+
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -98,6 +98,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
+ 	bcm4708-asus-rt-ac56u.dtb \
+ 	bcm4708-asus-rt-ac68u.dtb \
+ 	bcm4708-buffalo-wzr-1750dhp.dtb \
++	bcm4708-buffalo-wzr-1166dhp.dtb \
++	bcm4708-buffalo-wzr-1166dhp2.dtb \
+ 	bcm4708-linksys-ea6300-v1.dtb \
+ 	bcm4708-linksys-ea6500-v2.dtb \
+ 	bcm4708-luxul-xap-1510.dtb \
+--- /dev/null
++++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp-common.dtsi
+@@ -0,0 +1,192 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
++/*
++ * Broadcom BCM470X / BCM5301X ARM platform code.
++ * DTS for Buffalo WZR-1166DHP and WZR-1166DHP2
++ *
++ * Copyright (C) 2014 Rafał Miłecki <[email protected]>
++ * Copyright (C) 2022 SHIMAMOTO Takayoshi <[email protected]>
++ */
++
++
++#include "bcm4708.dtsi"
++#include "bcm5301x-nand-cs0-bch8.dtsi"
++#include <dt-bindings/leds/common.h>
++
++/ {
++	spi {
++		compatible = "spi-gpio";
++		num-chipselects = <1>;
++		gpio-sck = <&chipcommon 7 0>;
++		gpio-mosi = <&chipcommon 4 0>;
++		cs-gpios = <&chipcommon 6 0>;
++		#address-cells = <1>;
++		#size-cells = <0>;
++
++		hc595: gpio_spi@0 {
++			compatible = "fairchild,74hc595";
++			reg = <0>;
++			registers-number = <1>;
++			spi-max-frequency = <100000>;
++
++			gpio-controller;
++			#gpio-cells = <2>;
++
++		};
++	};
++
++	leds {
++		compatible = "gpio-leds";
++
++		usb {
++			/* label = "bcm53xx:blue:usb"; */
++			function = LED_FUNCTION_USB;
++			color = <LED_COLOR_ID_BLUE>;
++			gpios = <&hc595 0 GPIO_ACTIVE_HIGH>;
++			trigger-sources = <&ohci_port1>, <&ehci_port1>,
++					  <&xhci_port1>, <&ohci_port2>,
++					  <&ehci_port2>;
++			linux,default-trigger = "usbport";
++		};
++
++		power0 {
++			/* label = "bcm53xx:red:power"; */
++			function = LED_FUNCTION_FAULT;
++			color = <LED_COLOR_ID_RED>;
++			gpios = <&hc595 1 GPIO_ACTIVE_HIGH>;
++		};
++
++		power1 {
++			/* label = "bcm53xx:white:power"; */
++			function = LED_FUNCTION_POWER;
++			color = <LED_COLOR_ID_WHITE>;
++			gpios = <&hc595 2 GPIO_ACTIVE_HIGH>;
++			linux,default-trigger = "default-on";
++		};
++
++		router0 {
++			/*  label = "bcm53xx:blue:router"; */
++			function = LED_FUNCTION_STATUS;
++			color = <LED_COLOR_ID_BLUE>;
++			gpios = <&hc595 3 GPIO_ACTIVE_HIGH>;
++			linux,default-trigger = "default-on";
++		};
++
++		router1 {
++			/* label = "bcm53xx:amber:router"; */
++			function = LED_FUNCTION_STATUS;
++			color = <LED_COLOR_ID_AMBER>;
++			gpios = <&hc595 4 GPIO_ACTIVE_HIGH>;
++		};
++
++		wan {
++			/* label = "bcm53xx:blue:wan"; */
++			function = LED_FUNCTION_WAN;
++			color = <LED_COLOR_ID_BLUE>;
++			gpios = <&hc595 5 GPIO_ACTIVE_HIGH>;
++			linux,default-trigger = "default-on";
++		};
++
++		wireless0 {
++			/* label = "bcm53xx:blue:wireless"; */
++			function = LED_FUNCTION_WLAN;
++			color = <LED_COLOR_ID_BLUE>;
++			gpios = <&hc595 6 GPIO_ACTIVE_HIGH>;
++		};
++
++		wireless1 {
++			/* label = "bcm53xx:amber:wireless"; */
++			function = LED_FUNCTION_WLAN;
++			color = <LED_COLOR_ID_AMBER>;
++			gpios = <&hc595 7 GPIO_ACTIVE_HIGH>;
++		};
++	};
++
++	gpio-keys {
++		compatible = "gpio-keys";
++
++		restart {
++			label = "Reset";
++			linux,code = <KEY_RESTART>;
++			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
++		};
++
++		aoss {
++			label = "AOSS";
++			linux,code = <KEY_WPS_BUTTON>;
++			gpios = <&chipcommon 12 GPIO_ACTIVE_LOW>;
++		};
++
++		/* Commit mode set by switch? */
++		mode {
++			label = "Mode";
++			linux,code = <KEY_SETUP>;
++			gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
++		};
++
++		/* Switch: AP mode */
++		sw_ap {
++			label = "AP";
++			linux,code = <BTN_0>;
++			gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
++		};
++
++		eject {
++			label = "USB eject";
++			linux,code = <KEY_EJECTCD>;
++			gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
++		};
++	};
++};
++
++&usb2 {
++	vcc-gpio = <&chipcommon 9 GPIO_ACTIVE_HIGH>;
++};
++
++&usb3 {
++	vcc-gpio = <&chipcommon 10 GPIO_ACTIVE_LOW>;
++};
++
++&spi_nor {
++	status = "okay";
++};
++
++&usb3_phy {
++	status = "okay";
++};
++
++&srab {
++	status = "okay";
++
++	ports {
++		port@0 {
++			reg = <0>;
++			label = "lan1";
++		};
++
++		port@1 {
++			reg = <1>;
++			label = "lan2";
++		};
++
++		port@2 {
++			reg = <2>;
++			label = "lan3";
++		};
++
++		port@3 {
++			reg = <3>;
++			label = "lan4";
++		};
++
++		port@4 {
++			reg = <4>;
++			label = "wan";
++		};
++
++		port@5 {
++			reg = <5>;
++			label = "cpu";
++			ethernet = <&gmac0>;
++		};
++	};
++};
+--- /dev/null
++++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp.dts
+@@ -0,0 +1,26 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
++/*
++ * Device Tree Bindigs for Buffalo WZR-1166DHP
++ *
++ * Copyright (C) 2022 SHIMAMOTO Takayoshi <[email protected]>
++ */
++
++/dts-v1/;
++
++#include "bcm4708-buffalo-wzr-1166dhp-common.dtsi"
++
++/ {
++	compatible = "buffalo,wzr-1166dhp", "brcm,bcm4708";
++	model = "Buffalo WZR-1166DHP";
++
++	chosen {
++		bootargs = "console=ttyS0,115200";
++	};
++
++	memory@0 {
++		device_type = "memory";
++		reg = <0x00000000 0x08000000>,
++		      <0x88000000 0x18000000>;
++	};
++
++};
+--- /dev/null
++++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp2.dts
+@@ -0,0 +1,26 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
++/*
++ * Device Tree Bindigs for Buffalo WZR-1166DHP2
++ *
++ * Copyright (C) 2022 SHIMAMOTO Takayoshi <[email protected]>
++ */
++
++/dts-v1/;
++
++#include "bcm4708-buffalo-wzr-1166dhp-common.dtsi"
++
++/ {
++	compatible = "buffalo,wzr-1166dhp2", "brcm,bcm4708";
++	model = "Buffalo WZR-1166DHP2";
++
++	chosen {
++		bootargs = "console=ttyS0,115200";
++	};
++
++	memory@0 {
++		device_type = "memory";
++		reg = <0x00000000 0x08000000>,
++		      <0x88000000 0x08000000>;
++	};
++
++};

target/linux/bcm53xx/patches-5.15/033-v5.19-0009-Revert-ARM-dts-BCM5301X-Fix-DTC-warning-for-NAND-nod.patch

@@ -0,0 +1,32 @@
+From 18176b9d82eebaf4408dc0440f54d57a8cbced83 Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <[email protected]>
+Date: Fri, 13 May 2022 11:11:07 +0200
+Subject: [PATCH] Revert "ARM: dts: BCM5301X: Fix DTC warning for NAND node"
+
+This reverts commit 90103611d573, which caused a new DTC warning
+
+arch/arm/boot/dts/bcm953012hr.dts:57.3-33: Warning (reg_format): /nand-controller@18028000/nand@0/partition@0:reg: property has invalid length (8 bytes) (#address-cells == 2, #size-cells == 1)
+arch/arm/boot/dts/bcm953012hr.dts:62.3-33: Warning (reg_format): /nand-controller@18028000/nand@0/partition@200000:reg: property has invalid length (8 bytes) (#address-cells == 2, #size-cells == 1)
+arch/arm/boot/dts/bcm953012hr.dts:66.3-33: Warning (reg_format): /nand-controller@18028000/nand@0/partition@600000:reg: property has invalid length (8 bytes) (#address-cells == 2, #size-cells == 1)
+arch/arm/boot/dts/bcm953012hr.dts:70.3-33: Warning (reg_format): /nand-controller@18028000/nand@0/partition@1000000:reg: property has invalid length (8 bytes) (#address-cells == 2, #size-cells == 1)
+arch/arm/boot/dts/bcm953012hr.dtb: Warning (pci_device_reg): Failed prerequisite 'reg_format'
+arch/arm/boot/dts/bcm953012hr.dtb: Warning (pci_device_bus_num): Failed prerequisite 'reg_format'
+arch/arm/boot/dts/bcm953012hr.dtb: Warning (i2c_bus_reg): Failed prerequisite 'reg_format'
+arch/arm/boot/dts/bcm953012hr.dtb: Warning (spi_bus_reg): Failed prerequisite 'reg_format'
+
+Signed-off-by: Arnd Bergmann <[email protected]>
+---
+ arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
++++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
+@@ -10,6 +10,8 @@
+ 		nandcs: nand@0 {
+ 			compatible = "brcm,nandcs";
+ 			reg = <0>;
++			#address-cells = <1>;
++			#size-cells = <1>;
+ 
+ 			partitions {
+ 				compatible = "brcm,bcm947xx-cfe-partitions";

target/linux/bcm53xx/patches-5.15/034-v6.0-0001-ARM-dts-broadcom-align-gpio-key-node-names-with-dtsc.patch

@@ -0,0 +1,912 @@
+From c5aec5611aec8fb1ca68f68e41acaefccfc93c16 Mon Sep 17 00:00:00 2001
+From: Krzysztof Kozlowski <[email protected]>
+Date: Thu, 9 Jun 2022 13:39:30 +0200
+Subject: [PATCH] ARM: dts: broadcom: align gpio-key node names with dtschema
+
+The node names should be generic and DT schema expects certain pattern
+(e.g. with key/button/switch).
+
+Signed-off-by: Krzysztof Kozlowski <[email protected]>
+Signed-off-by: Florian Fainelli <[email protected]>
+---
+ arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts          |  6 +++---
+ arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts          |  8 ++++----
+ .../boot/dts/bcm4708-buffalo-wzr-1166dhp-common.dtsi | 10 +++++-----
+ arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts    | 10 +++++-----
+ arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts      |  4 ++--
+ arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts      |  4 ++--
+ arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts         |  2 +-
+ arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts         |  2 +-
+ arch/arm/boot/dts/bcm4708-netgear-r6250.dts          |  6 +++---
+ arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts       |  6 +++---
+ arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts        |  6 +++---
+ arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts          |  4 ++--
+ arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts   |  8 ++++----
+ arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts    |  2 +-
+ arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts        |  2 +-
+ arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts        |  2 +-
+ arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts   |  4 ++--
+ arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts          |  4 ++--
+ arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts    | 12 ++++++------
+ arch/arm/boot/dts/bcm4709-linksys-ea9200.dts         |  4 ++--
+ arch/arm/boot/dts/bcm4709-netgear-r7000.dts          |  6 +++---
+ arch/arm/boot/dts/bcm4709-netgear-r8000.dts          |  8 ++++----
+ arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts    |  4 ++--
+ arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts         |  8 ++++----
+ arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts        |  6 +++---
+ arch/arm/boot/dts/bcm47094-linksys-panamera.dts      |  6 +++---
+ arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts        |  2 +-
+ arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts        |  2 +-
+ arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts        |  2 +-
+ arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts        |  2 +-
+ arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts        |  2 +-
+ arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts     |  2 +-
+ arch/arm/boot/dts/bcm47094-netgear-r8500.dts         |  8 ++++----
+ arch/arm/boot/dts/bcm47094-phicomm-k3.dts            |  2 +-
+ arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts        |  2 +-
+ arch/arm/boot/dts/bcm47189-luxul-xap-810.dts         |  2 +-
+ arch/arm/boot/dts/bcm47189-tenda-ac9.dts             |  6 +++---
+ arch/arm/boot/dts/bcm53016-meraki-mr32.dts           |  2 +-
+ arch/arm/boot/dts/bcm911360_entphn.dts               |  4 ++--
+ arch/arm/boot/dts/bcm947189acdbmr.dts                |  4 ++--
+ arch/arm/boot/dts/bcm953012er.dts                    |  4 ++--
+ arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi        |  2 +-
+ arch/arm/boot/dts/bcm958625-meraki-kingpin.dtsi      |  2 +-
+ 43 files changed, 97 insertions(+), 97 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
++++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
+@@ -70,19 +70,19 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		rfkill {
++		button-rfkill {
+ 			label = "WiFi";
+ 			linux,code = <KEY_RFKILL>;
+ 			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
++++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
+@@ -54,25 +54,25 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		brightness {
++		button-brightness {
+ 			label = "Backlight";
+ 			linux,code = <KEY_BRIGHTNESS_ZERO>;
+ 			gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		rfkill {
++		button-rfkill {
+ 			label = "WiFi";
+ 			linux,code = <KEY_RFKILL>;
+ 			gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp-common.dtsi
++++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp-common.dtsi
+@@ -104,33 +104,33 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		aoss {
++		button-aoss {
+ 			label = "AOSS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 12 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+ 		/* Commit mode set by switch? */
+-		mode {
++		button-mode {
+ 			label = "Mode";
+ 			linux,code = <KEY_SETUP>;
+ 			gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+ 		/* Switch: AP mode */
+-		sw_ap {
++		button-sw-ap {
+ 			label = "AP";
+ 			linux,code = <BTN_0>;
+ 			gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		eject {
++		button-eject {
+ 			label = "USB eject";
+ 			linux,code = <KEY_EJECTCD>;
+ 			gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
++++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
+@@ -100,33 +100,33 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		aoss {
++		button-aoss {
+ 			label = "AOSS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 12 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+ 		/* Commit mode set by switch? */
+-		mode {
++		button-mode {
+ 			label = "Mode";
+ 			linux,code = <KEY_SETUP>;
+ 			gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+ 		/* Switch: AP mode */
+-		sw_ap {
++		button-sw-ap {
+ 			label = "AP";
+ 			linux,code = <BTN_0>;
+ 			gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		eject {
++		button-eject {
+ 			label = "USB eject";
+ 			linux,code = <KEY_EJECTCD>;
+ 			gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
++++ b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
+@@ -29,13 +29,13 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts
++++ b/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts
+@@ -25,13 +25,13 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
++++ b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
+@@ -45,7 +45,7 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
++++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
+@@ -52,7 +52,7 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
++++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
+@@ -63,19 +63,19 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		rfkill {
++		button-rfkill {
+ 			label = "WiFi";
+ 			linux,code = <KEY_RFKILL>;
+ 			gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
++++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
+@@ -59,19 +59,19 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		rfkill {
++		button-rfkill {
+ 			label = "WiFi";
+ 			linux,code = <KEY_RFKILL>;
+ 			gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
++++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
+@@ -94,19 +94,19 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		rfkill {
++		button-rfkill {
+ 			label = "WiFi";
+ 			linux,code = <KEY_RFKILL>;
+ 			gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
++++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
+@@ -60,13 +60,13 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
++++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
+@@ -91,26 +91,26 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		aoss {
++		button-aoss {
+ 			label = "AOSS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 9 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+ 		/* Switch device mode? */
+-		mode {
++		button-mode {
+ 			label = "Mode";
+ 			linux,code = <KEY_SETUP>;
+ 			gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		eject {
++		button-eject {
+ 			label = "USB eject";
+ 			linux,code = <KEY_EJECTCD>;
+ 			gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
++++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
+@@ -96,7 +96,7 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
++++ b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
+@@ -45,7 +45,7 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
++++ b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
+@@ -94,7 +94,7 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
++++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
+@@ -77,13 +77,13 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		rfkill {
++		button-rfkill {
+ 			label = "WiFi";
+ 			linux,code = <KEY_RFKILL>;
+ 			gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
++++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
+@@ -50,13 +50,13 @@
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
++++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
+@@ -80,39 +80,39 @@
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
+ 
+-		power {
++		button-power {
+ 			label = "Power";
+ 			linux,code = <KEY_POWER>;
+ 			gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		aoss {
++		button-aoss {
+ 			label = "AOSS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 16 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+ 		/* Commit mode set by switch? */
+-		mode {
++		button-mode {
+ 			label = "Mode";
+ 			linux,code = <KEY_SETUP>;
+ 			gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+ 		/* Switch: AP mode */
+-		sw_ap {
++		button-sw-ap {
+ 			label = "AP";
+ 			linux,code = <BTN_0>;
+ 			gpios = <&chipcommon 18 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		eject {
++		button-eject {
+ 			label = "USB eject";
+ 			linux,code = <KEY_EJECTCD>;
+ 			gpios = <&chipcommon 20 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
++++ b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
+@@ -32,13 +32,13 @@
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
++++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
+@@ -75,19 +75,19 @@
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		rfkill {
++		button-rfkill {
+ 			label = "WiFi";
+ 			linux,code = <KEY_RFKILL>;
+ 			gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
++++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
+@@ -102,25 +102,25 @@
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
+ 
+-		rfkill {
++		button-rfkill {
+ 			label = "WiFi";
+ 			linux,code = <KEY_RFKILL>;
+ 			gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		brightness {
++		button-brightness {
+ 			label = "Backlight";
+ 			linux,code = <KEY_BRIGHTNESS_ZERO>;
+ 			gpios = <&chipcommon 19 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
++++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
+@@ -80,13 +80,13 @@
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts
++++ b/arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts
+@@ -72,25 +72,25 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 20 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		reset {
++		button-reset {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		wifi {
++		button-wifi {
+ 			label = "Wi-Fi";
+ 			linux,code = <KEY_RFKILL>;
+ 			gpios = <&chipcommon 18 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		led {
++		button-led {
+ 			label = "Backlight";
+ 			linux,code = <KEY_BRIGHTNESS_ZERO>;
+ 			gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
++++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
+@@ -86,20 +86,20 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+ 		/* Switch: router / extender */
+-		extender {
++		button-extender {
+ 			label = "Extender";
+ 			linux,code = <BTN_0>;
+ 			gpios = <&chipcommon 10 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
++++ b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
+@@ -30,19 +30,19 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		rfkill {
++		button-rfkill {
+ 				label = "WiFi";
+ 				linux,code = <KEY_RFKILL>;
+ 				gpios = <&chipcommon 16 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		reset {
++		button-reset {
+ 				label = "Reset";
+ 				linux,code = <KEY_RESTART>;
+ 				gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
++++ b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
+@@ -49,7 +49,7 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts
++++ b/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts
+@@ -43,7 +43,7 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
++++ b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
+@@ -49,7 +49,7 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts
++++ b/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts
+@@ -37,7 +37,7 @@
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 19 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
++++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
+@@ -89,7 +89,7 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts
++++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts
+@@ -67,7 +67,7 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
++++ b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
+@@ -65,25 +65,25 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		brightness {
++		button-brightness {
+ 			label = "Backlight";
+ 			linux,code = <KEY_BRIGHTNESS_ZERO>;
+ 			gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 10 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		rfkill {
++		button-rfkill {
+ 			label = "WiFi";
+ 			linux,code = <KEY_RFKILL>;
+ 			gpios = <&chipcommon 20 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47094-phicomm-k3.dts
++++ b/arch/arm/boot/dts/bcm47094-phicomm-k3.dts
+@@ -22,7 +22,7 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
++++ b/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
+@@ -39,7 +39,7 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
++++ b/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
+@@ -49,7 +49,7 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm47189-tenda-ac9.dts
++++ b/arch/arm/boot/dts/bcm47189-tenda-ac9.dts
+@@ -59,19 +59,19 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		rfkill {
++		button-rfkill {
+ 			label = "WiFi";
+ 			linux,code = <KEY_RFKILL>;
+ 			gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 9 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm53016-meraki-mr32.dts
++++ b/arch/arm/boot/dts/bcm53016-meraki-mr32.dts
+@@ -50,7 +50,7 @@
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 21 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm911360_entphn.dts
++++ b/arch/arm/boot/dts/bcm911360_entphn.dts
+@@ -47,10 +47,10 @@
+ 		stdout-path = "serial0:115200n8";
+ 	};
+ 
+-	gpio_keys {
++	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		hook {
++		button-hook {
+ 			label = "HOOK";
+ 			linux,code = <KEY_O>;
+ 			gpios = <&gpio_asiu 48 0>;
+--- a/arch/arm/boot/dts/bcm947189acdbmr.dts
++++ b/arch/arm/boot/dts/bcm947189acdbmr.dts
+@@ -44,13 +44,13 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 7 GPIO_ACTIVE_HIGH>;
+ 		};
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 9 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm953012er.dts
++++ b/arch/arm/boot/dts/bcm953012er.dts
+@@ -47,13 +47,13 @@
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+ 
+-		wps {
++		button-wps {
+ 			label = "WPS";
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 			gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
+ 		};
+ 
+-		restart {
++		button-restart {
+ 			label = "Reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi
++++ b/arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi
+@@ -13,7 +13,7 @@
+ 		autorepeat;
+ 		poll-interval = <20>;
+ 
+-		reset {
++		button-reset {
+ 			label = "reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&gpioa 8 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm958625-meraki-kingpin.dtsi
++++ b/arch/arm/boot/dts/bcm958625-meraki-kingpin.dtsi
+@@ -14,7 +14,7 @@
+ 		autorepeat;
+ 		poll-interval = <20>;
+ 
+-		reset {
++		button-reset {
+ 			label = "reset";
+ 			linux,code = <KEY_RESTART>;
+ 			gpios = <&gpioa 6 GPIO_ACTIVE_LOW>;

target/linux/bcm53xx/patches-5.15/034-v6.0-0002-ARM-dts-broadcom-correct-gpio-keys-properties.patch

@@ -0,0 +1,108 @@
+From d634a6969c03803a945fdc2bccbe7d813420e569 Mon Sep 17 00:00:00 2001
+From: Krzysztof Kozlowski <[email protected]>
+Date: Thu, 9 Jun 2022 13:39:31 +0200
+Subject: [PATCH] ARM: dts: broadcom: correct gpio-keys properties
+
+gpio-keys children do not use unit addresses.
+
+Signed-off-by: Krzysztof Kozlowski <[email protected]>
+Signed-off-by: Florian Fainelli <[email protected]>
+---
+ arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts       | 2 --
+ arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 2 --
+ arch/arm/boot/dts/bcm4709-linksys-ea9200.dts      | 2 --
+ arch/arm/boot/dts/bcm4709-netgear-r7000.dts       | 2 --
+ arch/arm/boot/dts/bcm4709-netgear-r8000.dts       | 2 --
+ arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 2 --
+ arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts     | 2 --
+ arch/arm/boot/dts/bcm53016-meraki-mr32.dts        | 2 --
+ 8 files changed, 16 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
++++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
+@@ -47,8 +47,6 @@
+ 
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+ 
+ 		button-wps {
+ 			label = "WPS";
+--- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
++++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
+@@ -77,8 +77,6 @@
+ 
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+ 
+ 		button-power {
+ 			label = "Power";
+--- a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
++++ b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
+@@ -29,8 +29,6 @@
+ 
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+ 
+ 		button-wps {
+ 			label = "WPS";
+--- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
++++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
+@@ -72,8 +72,6 @@
+ 
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+ 
+ 		button-wps {
+ 			label = "WPS";
+--- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
++++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
+@@ -99,8 +99,6 @@
+ 
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+ 
+ 		button-rfkill {
+ 			label = "WiFi";
+--- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
++++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
+@@ -77,8 +77,6 @@
+ 
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+ 
+ 		button-wps {
+ 			label = "WPS";
+--- a/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts
++++ b/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts
+@@ -34,8 +34,6 @@
+ 
+ 	gpio-keys {
+ 		compatible = "gpio-keys";
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+ 
+ 		button-restart {
+ 			label = "Reset";
+--- a/arch/arm/boot/dts/bcm53016-meraki-mr32.dts
++++ b/arch/arm/boot/dts/bcm53016-meraki-mr32.dts
+@@ -47,8 +47,6 @@
+ 
+ 	keys {
+ 		compatible = "gpio-keys";
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+ 
+ 		button-restart {
+ 			label = "Reset";

target/linux/bcm53xx/patches-5.15/035-v6.2-0001-ARM-dts-BCM5301X-Correct-description-of-TP-Link-part.patch

@@ -0,0 +1,99 @@
+From c8ee9f119bfb4244f76c9971c341ec06b49332cd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <[email protected]>
+Date: Tue, 8 Nov 2022 12:07:08 +0100
+Subject: [PATCH] ARM: dts: BCM5301X: Correct description of TP-Link partitions
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+TP-Link routers have flash space partitioned according to the partitions
+table. It may look like fixed partitioning but those partitions can be
+actually reorganized. New can be added (or some removed), offsets and
+sizes may change.
+
+Fix DT to use binding for the TP-Link SafeLoader partitioning method.
+
+Signed-off-by: Rafał Miłecki <[email protected]>
+Link: https://lore.kernel.org/r/[email protected]
+Signed-off-by: Florian Fainelli <[email protected]>
+---
+ .../boot/dts/bcm47081-tplink-archer-c5-v2.dts | 25 ++++---------------
+ .../boot/dts/bcm4709-tplink-archer-c9-v1.dts  | 25 ++++---------------
+ 2 files changed, 10 insertions(+), 40 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
++++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
+@@ -95,30 +95,15 @@
+ 	status = "okay";
+ 
+ 	partitions {
+-		compatible = "fixed-partitions";
+-		#address-cells = <1>;
+-		#size-cells = <1>;
++		compatible = "tplink,safeloader-partitions";
++		partitions-table-offset = <0xe50000>;
+ 
+-		boot@0 {
+-			label = "boot";
+-			reg = <0x000000 0x040000>;
+-			read-only;
+-		};
+-
+-		os-image@100000 {
+-			label = "os-image";
+-			reg = <0x040000 0x200000>;
++		partition-os-image {
+ 			compatible = "brcm,trx";
+ 		};
+ 
+-		rootfs@240000 {
+-			label = "rootfs";
+-			reg = <0x240000 0xc00000>;
+-		};
+-
+-		nvram@ff0000 {
+-			label = "nvram";
+-			reg = <0xff0000 0x010000>;
++		partition-file-system {
++			linux,rootfs;
+ 		};
+ 	};
+ };
+--- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
++++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
+@@ -104,30 +104,15 @@
+ 	status = "okay";
+ 
+ 	partitions {
+-		compatible = "fixed-partitions";
+-		#address-cells = <1>;
+-		#size-cells = <1>;
++		compatible = "tplink,safeloader-partitions";
++		partitions-table-offset = <0xe50000>;
+ 
+-		boot@0 {
+-			label = "boot";
+-			reg = <0x000000 0x040000>;
+-			read-only;
+-		};
+-
+-		os-image@100000 {
+-			label = "os-image";
+-			reg = <0x040000 0x200000>;
++		partition-os-image {
+ 			compatible = "brcm,trx";
+ 		};
+ 
+-		rootfs@240000 {
+-			label = "rootfs";
+-			reg = <0x240000 0xc00000>;
+-		};
+-
+-		nvram@ff0000 {
+-			label = "nvram";
+-			reg = <0xff0000 0x010000>;
++		partition-file-system {
++			linux,rootfs;
+ 		};
+ 	};
+ };

target/linux/bcm53xx/patches-5.15/035-v6.2-0001-ARM-dts-bcm47094-Add-devicetree-for-D-Link-DIR-890L.patch

@@ -0,0 +1,242 @@
+From b1ba87897ceda8e49a47aa92832dd7bff8583e21 Mon Sep 17 00:00:00 2001
+From: Linus Walleij <[email protected]>
+Date: Mon, 7 Nov 2022 14:41:04 +0100
+Subject: [PATCH] ARM: dts: bcm47094: Add devicetree for D-Link DIR-890L
+
+This adds a device tree for the D-Link DIR-890L. This device
+is very similar to D-Link DIR-885L, the differences are detailed
+as a comment in the DTS file.
+
+Signed-off-by: Linus Walleij <[email protected]>
+Link: https://lore.kernel.org/r/[email protected]
+Signed-off-by: Florian Fainelli <[email protected]>
+---
+ arch/arm/boot/dts/Makefile                    |   1 +
+ arch/arm/boot/dts/bcm47094-dlink-dir-890l.dts | 211 ++++++++++++++++++
+ 2 files changed, 212 insertions(+)
+ create mode 100644 arch/arm/boot/dts/bcm47094-dlink-dir-890l.dts
+
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -121,6 +121,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
+ 	bcm4709-tplink-archer-c9-v1.dtb \
+ 	bcm47094-asus-rt-ac88u.dtb \
+ 	bcm47094-dlink-dir-885l.dtb \
++	bcm47094-dlink-dir-890l.dtb \
+ 	bcm47094-linksys-panamera.dtb \
+ 	bcm47094-luxul-abr-4500.dtb \
+ 	bcm47094-luxul-xap-1610.dtb \
+--- /dev/null
++++ b/arch/arm/boot/dts/bcm47094-dlink-dir-890l.dts
+@@ -0,0 +1,211 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
++/*
++ * Device tree for D-Link DIR-890L
++ * D-Link calls this board "WRGAC36"
++ * this router has the same looks and form factor as D-Link DIR-885L.
++ *
++ * Some differences from DIR-885L include a separate USB2 port, separate LEDs
++ * for USB2 and USB3, a separate VCC supply for the USB2 slot and no
++ * router/extender switch is mounted (there is an empty mount point on the
++ * PCB) so this device is a pure router. Also the LAN ports are in the right
++ * order.
++ *
++ * Based on the device tree for DIR-885L
++ * Copyright (C) 2016 Rafał Miłecki <[email protected]>
++ * Copyright (C) 2022 Linus Walleij
++ */
++
++/dts-v1/;
++
++#include "bcm47094.dtsi"
++#include "bcm5301x-nand-cs0-bch1.dtsi"
++
++/ {
++	compatible = "dlink,dir-890l", "brcm,bcm47094", "brcm,bcm4708";
++	model = "D-Link DIR-890L";
++
++	chosen {
++		bootargs = "console=ttyS0,115200 earlycon";
++	};
++
++	memory@0 {
++		device_type = "memory";
++		reg = <0x00000000 0x08000000>,
++		      <0x88000000 0x08000000>;
++	};
++
++	leds {
++		/*
++		 * LED information is derived from the boot log which
++		 * conveniently lists all the LEDs.
++		 */
++		compatible = "gpio-leds";
++
++		power-white {
++			label = "bcm53xx:white:power";
++			gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
++			linux,default-trigger = "default-on";
++		};
++
++		wan-white {
++			label = "bcm53xx:white:wan";
++			gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
++		};
++
++		power-amber {
++			label = "bcm53xx:amber:power";
++			gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
++		};
++
++		wan-amber {
++			label = "bcm53xx:amber:wan";
++			gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
++		};
++
++		usb3-white {
++			label = "bcm53xx:white:usb3";
++			gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>;
++			trigger-sources = <&xhci_port1>;
++			linux,default-trigger = "usbport";
++		};
++
++		usb2-white {
++			label = "bcm53xx:white:usb2";
++			gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
++			trigger-sources = <&ohci_port1>, <&ehci_port1>;
++			linux,default-trigger = "usbport";
++		};
++
++		2ghz {
++			label = "bcm53xx:white:2ghz";
++			gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
++		};
++
++		5ghz {
++			label = "bcm53xx:white:5ghz";
++			gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
++		};
++	};
++
++	gpio-keys {
++		compatible = "gpio-keys";
++
++		button-wps {
++			label = "WPS";
++			linux,code = <KEY_WPS_BUTTON>;
++			gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
++		};
++
++		/* Called "factory reset" in the vendor dmesg */
++		button-restart {
++			label = "Reset";
++			linux,code = <KEY_RESTART>;
++			gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
++		};
++	};
++
++	/*
++	 * The flash memory is memory mapped at 0x1e000000-0x1fffffff
++	 * 64KB blocks; total size 2MB, same that can be
++	 * found attached to the spi_nor SPI controller.
++	 */
++	nvram@1e1f0000 {
++		compatible = "brcm,nvram";
++		reg = <0x1e1f0000 0x00010000>;
++
++		et0macaddr: et0macaddr {
++		};
++	};
++};
++
++&gmac2 {
++	/*
++	 * The NVRAM curiously does not contain a MAC address
++	 * for et2 so since that is the only ethernet interface
++	 * actually in use on the platform, we use this et0 MAC
++	 * address for et2.
++	 */
++	nvmem-cells = <&et0macaddr>;
++	nvmem-cell-names = "mac-address";
++};
++
++&spi_nor {
++	status = "okay";
++};
++
++&nandcs {
++	/* Spansion S34ML01G2, 128MB with 128KB erase blocks */
++	partitions {
++		compatible = "fixed-partitions";
++		#address-cells = <1>;
++		#size-cells = <1>;
++
++		/*
++		 * This is called "nflash" in the vendor kernel with
++		 * "upgrade" and "rootfs" (probably using OpenWrt
++		 * splitpart). We call it "firmware" like standard tools
++		 * assume. The CFE loader contains incorrect information
++		 * about TRX partitions, ignore this, there are no TRX
++		 * partitions: this device uses SEAMA.
++		 */
++		firmware@0 {
++			label = "firmware";
++			reg = <0x00000000 0x08000000>;
++		};
++	};
++};
++
++&usb2 {
++	vcc-gpios = <&chipcommon 21 GPIO_ACTIVE_HIGH>;
++};
++
++&usb3 {
++	vcc-gpios = <&chipcommon 18 GPIO_ACTIVE_HIGH>;
++};
++
++&usb3_phy {
++	status = "okay";
++};
++
++&srab {
++	status = "okay";
++
++	ports {
++		port@0 {
++			reg = <0>;
++			label = "lan1";
++		};
++
++		port@1 {
++			reg = <1>;
++			label = "lan2";
++		};
++
++		port@2 {
++			reg = <2>;
++			label = "lan3";
++		};
++
++		port@3 {
++			reg = <3>;
++			label = "lan4";
++		};
++
++		port@4 {
++			reg = <4>;
++			label = "wan";
++		};
++
++		port@8 {
++			reg = <8>;
++			label = "cpu";
++			ethernet = <&gmac2>;
++			phy-mode = "rgmii";
++
++			fixed-link {
++				speed = <1000>;
++				full-duplex;
++			};
++		};
++	};
++};

target/linux/bcm53xx/patches-5.15/035-v6.2-0001-ARM-dts-bcm53016-Add-devicetree-for-D-Link-DWL-8610A.patch

@@ -0,0 +1,165 @@
+From 9f66e1dd82e3186aee95282657512ca2aef1afe0 Mon Sep 17 00:00:00 2001
+From: Linus Walleij <[email protected]>
+Date: Wed, 19 Oct 2022 21:34:49 +0200
+Subject: [PATCH] ARM: dts: bcm53016: Add devicetree for D-Link DWL-8610AP
+
+This adds a device tree for the BCM53016-based D-Link DWL-8610AP
+access point wireless router.
+
+The TRX-format partitions had to be named "firmware" due to
+an OpenWrt patch that only accepts parting such nodes if they
+are named "firmware".
+
+Signed-off-by: Linus Walleij <[email protected]>
+Link: https://lore.kernel.org/r/[email protected]
+Signed-off-by: Florian Fainelli <[email protected]>
+---
+ arch/arm/boot/dts/Makefile                    |   1 +
+ .../boot/dts/bcm53016-dlink-dwl-8610ap.dts    | 131 ++++++++++++++++++
+ 2 files changed, 132 insertions(+)
+ create mode 100644 arch/arm/boot/dts/bcm53016-dlink-dwl-8610ap.dts
+
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -132,6 +132,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
+ 	bcm47094-netgear-r8500.dtb \
+ 	bcm47094-phicomm-k3.dtb \
+ 	bcm53015-meraki-mr26.dtb \
++	bcm53016-dlink-dwl-8610ap.dtb \
+ 	bcm53016-meraki-mr32.dtb \
+ 	bcm94708.dtb \
+ 	bcm94709.dtb \
+--- /dev/null
++++ b/arch/arm/boot/dts/bcm53016-dlink-dwl-8610ap.dts
+@@ -0,0 +1,131 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
++/dts-v1/;
++
++#include "bcm4709.dtsi"
++#include "bcm5301x-nand-cs0-bch8.dtsi"
++#include <dt-bindings/leds/common.h>
++#include <dt-bindings/input/input.h>
++
++/ {
++	model = "D-Link DWL-8610AP";
++	compatible = "dlink,dwl-8610ap", "brcm,bcm53016", "brcm,bcm4708";
++
++	memory@0 {
++		device_type = "memory";
++		/* 512 MB RAM in 2 x Macronix D9PSH chips */
++		reg = <0x00000000 0x08000000>,
++		      <0x88000000 0x08000000>;
++	};
++
++	leds {
++		compatible = "gpio-leds";
++
++		power {
++			function = LED_FUNCTION_POWER;
++			color = <LED_COLOR_ID_GREEN>;
++			gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
++			default-state = "on";
++		};
++
++		diag {
++			/* Actually "diag" unclear what this means */
++			function = LED_FUNCTION_INDICATOR;
++			color = <LED_COLOR_ID_RED>;
++			gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
++			default-state = "on";
++			linux,default-trigger = "heartbeat";
++		};
++
++		wlan-2g {
++			function = LED_FUNCTION_WLAN;
++			color = <LED_COLOR_ID_GREEN>;
++			gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;
++		};
++
++		wlan-5g {
++			function = LED_FUNCTION_WLAN;
++			color = <LED_COLOR_ID_GREEN>;
++			gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>;
++		};
++	};
++
++	gpio_keys {
++		compatible = "gpio-keys";
++
++		button-reset {
++			debounce-interval = <100>;
++			wakeup-source;
++			linux,code = <KEY_RESTART>;
++			label = "reset";
++			/* This GPIO is actually stored in NVRAM, but it's not gonna change */
++			gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
++		};
++	};
++
++	/*
++	 * Flash memory at 0x1e000000-0x1fffffff
++	 * Macronix 32 64KB blocks; total size 2MB, same that can be
++	 * found attached to the spi_nor SPI controller.
++	 */
++	nvram@1e080000 {
++		compatible = "brcm,nvram";
++		reg = <0x1e080000 0x00020000>;
++
++		et0macaddr: et0macaddr {
++		};
++
++		et1macaddr: et1macaddr {
++		};
++	};
++};
++
++&gmac0 {
++	nvmem-cells = <&et0macaddr>;
++	nvmem-cell-names = "mac-address";
++};
++
++&gmac1 {
++	nvmem-cells = <&et1macaddr>;
++	nvmem-cell-names = "mac-address";
++};
++
++&spi_nor {
++	/* Serial SPI NOR Flash MX 25L1606E */
++	status = "okay";
++};
++
++&nandcs {
++	/*
++	 * Spansion S34ML01G100TFI00 128 MB NAND Flash memory
++	 *
++	 * This ECC is a bit unorthodox but it is what the stock firmware
++	 * is using, so to be able to mount the original partitions
++	 * this is necessary.
++	 */
++	nand-ecc-strength = <5>;
++	partitions {
++		compatible = "fixed-partitions";
++		#address-cells = <1>;
++		#size-cells = <1>;
++
++		/* This is named nflash1.trx in CFE */
++		trx@0 {
++			label = "firmware";
++			reg = <0x00000000 0x02800000>;
++			compatible = "brcm,trx";
++		};
++
++		/* This is named nflash1.trx2 in CFE */
++		trx2@2800000 {
++			label = "firmware2";
++			reg = <0x02800000 0x02800000>;
++			compatible = "brcm,trx";
++		};
++
++		/* This is named nflash1.rwfs in CFE */
++		free@5000000 {
++			label = "free";
++			reg = <0x05000000 0x03000000>;
++		};
++	};
++};

target/linux/bcm53xx/patches-5.15/304-ARM-dts-BCM5301X-Specify-switch-ports-for-remaining-.patch

@@ -311,7 +311,7 @@ Signed-off-by: Rafał Miłecki <[email protected]>
 +};
 --- a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
 +++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
-@@ -68,6 +68,38 @@
+@@ -66,6 +66,38 @@
  	status = "okay";
  };
  
@@ -352,7 +352,7 @@ Signed-off-by: Rafał Miłecki <[email protected]>
  		compatible = "fixed-partitions";
 --- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
 +++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
-@@ -132,3 +132,40 @@
+@@ -130,3 +130,40 @@
  &usb3_phy {
  	status = "okay";
  };
@@ -395,7 +395,7 @@ Signed-off-by: Rafał Miłecki <[email protected]>
 +};
 --- a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
 +++ b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
-@@ -49,3 +49,45 @@
+@@ -47,3 +47,45 @@
  &usb3_phy {
  	status = "okay";
  };
@@ -443,7 +443,7 @@ Signed-off-by: Rafał Miłecki <[email protected]>
 +};
 --- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
 +++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
-@@ -106,3 +106,40 @@
+@@ -104,3 +104,40 @@
  &usb3_phy {
  	status = "okay";
  };
@@ -621,7 +621,7 @@ Signed-off-by: Rafał Miłecki <[email protected]>
  
 --- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
 +++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
-@@ -102,6 +102,43 @@
+@@ -100,6 +100,43 @@
  	vcc-gpio = <&chipcommon 12 GPIO_ACTIVE_HIGH>;
  };
  

target/linux/bcm53xx/patches-5.15/310-ARM-BCM5301X-Add-DT-for-Netgear-R7900.patch

@@ -9,7 +9,7 @@ Signed-off-by: Rafał Miłecki <[email protected]>
 
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -115,6 +115,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
+@@ -117,6 +117,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
  	bcm4709-buffalo-wxr-1900dhp.dtb \
  	bcm4709-linksys-ea9200.dtb \
  	bcm4709-netgear-r7000.dtb \

target/linux/bcm53xx/patches-5.15/331-Meraki-MR32-Status-LEDs.patch

@@ -17,7 +17,7 @@ Signed-off-by: Christian Lamparter <[email protected]>
  	};
  
  	leds {
-@@ -68,7 +69,7 @@
+@@ -66,7 +67,7 @@
  			max-brightness = <255>;
  		};