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@adrianschmutzler.de>

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 8c612042c845b0c85aa782aa8ae3b9ef9ebb17dd..d51c5876835db013cfc4765f816320bb50724d18 100644 (file)
--- 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@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 96fc9853cbf875b11d552a656bff4d92a42c3626..f7889b00cc0c38ba95085d7bfd5b44dff2e25729 100644 (file)
--- 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@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 008caae2ec40babe5a107db43d4f9e29fddd5743..1f54d2134a3e753106cd9e3d80dfc7111c45fc0d 100644 (file)
--- 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@0,0 {
+               compatible = "pci168c,0033";
+               reg = <0x0000 0 0 0 0>;
+               mtd-mac-address = <&art 0x0>;
+               mtd-mac-address-increment = <16>;
+       };
+};