aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2021-01-19 14:53:36 +0100
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2021-01-19 21:41:25 +0100
commit847cda16eba23d4436a01b7313a21426b9c606fb (patch)
tree773ef83548ad0d65c883d349c9981efac819c506
parentbcb311497d3749b0a0d25c65ebad33bfa558d7eb (diff)
downloadupstream-847cda16eba23d4436a01b7313a21426b9c606fb.tar.gz
upstream-847cda16eba23d4436a01b7313a21426b9c606fb.tar.bz2
upstream-847cda16eba23d4436a01b7313a21426b9c606fb.zip
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>
-rw-r--r--target/linux/ath79/dts/qca9558_openmesh_mr.dtsi (renamed from target/linux/ath79/dts/qca9558_openmesh_mr900.dtsi)13
-rw-r--r--target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts19
-rw-r--r--target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts19
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
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@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@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@0,0 {
+ compatible = "pci168c,0033";
+ reg = <0x0000 0 0 0 0>;
+ mtd-mac-address = <&art 0x0>;
+ mtd-mac-address-increment = <16>;
+ };
+};