[openwrt/openwrt] ath79: make OpenMesh MR900 DTSI more general

[LEDE Commits]

adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/847cda16eba23d4436a01b7313a21426b9c606fb

commit 847cda16eba23d4436a01b7313a21426b9c606fb
Author: Adrian Schmutzler <freifunk at adrianschmutzler.de>
AuthorDate: Tue Jan 19 14:53:36 2021 +0100

    ath79: make OpenMesh MR900 DTSI more general
    
    The OpenMesh MR900 and to-be-added MR1750 family are very similar.
    Make the existing MR900 DTSI more general so it can be used for
    the MR1750 devices as well.
    
    Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
 ...8_openmesh_mr900.dtsi => qca9558_openmesh_mr.dtsi} | 13 ++-----------
 target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts  | 19 ++++++++++++++++++-
 target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts  | 19 ++++++++++++++++++-
 3 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/target/linux/ath79/dts/qca9558_openmesh_mr900.dtsi b/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi
similarity index 91%
rename from target/linux/ath79/dts/qca9558_openmesh_mr900.dtsi
rename to target/linux/ath79/dts/qca9558_openmesh_mr.dtsi
index 8c612042c8..d51c587683 100644
--- a/target/linux/ath79/dts/qca9558_openmesh_mr900.dtsi
+++ b/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi
@@ -37,10 +37,9 @@
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 
-		wifi2g_blue {
+		led_wifi2g: wifi2g {
 			label = "blue:wifi2g";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy0tpt";
 		};
 
 		status_green {
@@ -59,10 +58,9 @@
 			default-state = "on";
 		};
 
-		wifi5g_blue {
+		led_wifi5g: wifi5g {
 			label = "blue:wifi5g";
 			gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "phy1tpt";
 		};
 	};
 
@@ -168,11 +166,4 @@
 
 &pcie0 {
 	status = "okay";
-
-	wifi at 0,0 {
-		compatible = "pci168c,0033";
-		reg = <0x0000 0 0 0 0>;
-		mtd-mac-address = <&art 0x0>;
-		mtd-mac-address-increment = <16>;
-	};
 };
diff --git a/target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts b/target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts
index 96fc9853cb..f7889b00cc 100644
--- a/target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts
+++ b/target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts
@@ -1,8 +1,25 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include "qca9558_openmesh_mr900.dtsi"
+#include "qca9558_openmesh_mr.dtsi"
 
 / {
 	compatible = "openmesh,mr900-v1", "qca,qca9558";
 	model = "OpenMesh MR900 v1";
 };
+
+&led_wifi2g {
+	linux,default-trigger = "phy0tpt";
+};
+
+&led_wifi5g {
+	linux,default-trigger = "phy1tpt";
+};
+
+&pcie0 {
+	wifi at 0,0 {
+		compatible = "pci168c,0033";
+		reg = <0x0000 0 0 0 0>;
+		mtd-mac-address = <&art 0x0>;
+		mtd-mac-address-increment = <16>;
+	};
+};
diff --git a/target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts b/target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts
index 008caae2ec..1f54d2134a 100644
--- a/target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts
+++ b/target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts
@@ -1,8 +1,25 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include "qca9558_openmesh_mr900.dtsi"
+#include "qca9558_openmesh_mr.dtsi"
 
 / {
 	compatible = "openmesh,mr900-v2", "qca,qca9558";
 	model = "OpenMesh MR900 v2";
 };
+
+&led_wifi2g {
+	linux,default-trigger = "phy0tpt";
+};
+
+&led_wifi5g {
+	linux,default-trigger = "phy1tpt";
+};
+
+&pcie0 {
+	wifi at 0,0 {
+		compatible = "pci168c,0033";
+		reg = <0x0000 0 0 0 0>;
+		mtd-mac-address = <&art 0x0>;
+		mtd-mac-address-increment = <16>;
+	};
+};