[openwrt/openwrt] ramips: reorganize DTSI files for D-Link DIR-8xx
LEDE Commits
lede-commits at lists.infradead.org
Sun Jun 20 09:59:12 PDT 2021
adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/2001c0ca9fd2bf95827e23ba867fa06fc3b0a3e7
commit 2001c0ca9fd2bf95827e23ba867fa06fc3b0a3e7
Author: Adrian Schmutzler <freifunk at adrianschmutzler.de>
AuthorDate: Sun Jun 20 17:11:09 2021 +0200
ramips: reorganize DTSI files for D-Link DIR-8xx
* Remove micro-DTSI mt7621_dlink_dir-882-x1.dtsi to ease reading
config without too much inheritance
* Use "separate" partitioning DTSIs so we can use the partitioning
without a complete match on the other settings (i.e. without the
former parent DTSI)
* Rename files to express the new organization
Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
target/linux/ramips/dts/mt7621_dlink_dir-867-a1.dts | 3 ++-
target/linux/ramips/dts/mt7621_dlink_dir-878-a1.dts | 3 ++-
target/linux/ramips/dts/mt7621_dlink_dir-882-a1.dts | 20 ++++++++++++++++++--
target/linux/ramips/dts/mt7621_dlink_dir-882-r1.dts | 20 ++++++++++++++++++--
target/linux/ramips/dts/mt7621_dlink_dir-882-x1.dtsi | 17 -----------------
...ink_dir-8xx-x1.dtsi => mt7621_dlink_dir-8xx.dtsi} | 0
...ir-8xx-a1.dtsi => mt7621_dlink_flash-16m-a1.dtsi} | 2 --
...ir-8xx-r1.dtsi => mt7621_dlink_flash-16m-r1.dtsi} | 2 --
8 files changed, 40 insertions(+), 27 deletions(-)
diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-867-a1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-867-a1.dts
index b2ba5ecaa9..e02eb9eebf 100644
--- a/target/linux/ramips/dts/mt7621_dlink_dir-867-a1.dts
+++ b/target/linux/ramips/dts/mt7621_dlink_dir-867-a1.dts
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-#include "mt7621_dlink_dir-8xx-a1.dtsi"
+#include "mt7621_dlink_dir-8xx.dtsi"
+#include "mt7621_dlink_flash-16m-a1.dtsi"
/ {
compatible = "dlink,dir-867-a1", "mediatek,mt7621-soc";
diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-878-a1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-878-a1.dts
index 4bfe5ca43c..1f1d5824f2 100644
--- a/target/linux/ramips/dts/mt7621_dlink_dir-878-a1.dts
+++ b/target/linux/ramips/dts/mt7621_dlink_dir-878-a1.dts
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-#include "mt7621_dlink_dir-8xx-a1.dtsi"
+#include "mt7621_dlink_dir-8xx.dtsi"
+#include "mt7621_dlink_flash-16m-a1.dtsi"
/ {
compatible = "dlink,dir-878-a1", "mediatek,mt7621-soc";
diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-882-a1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-882-a1.dts
index cef0705393..01739fc258 100644
--- a/target/linux/ramips/dts/mt7621_dlink_dir-882-a1.dts
+++ b/target/linux/ramips/dts/mt7621_dlink_dir-882-a1.dts
@@ -1,9 +1,25 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-#include "mt7621_dlink_dir-8xx-a1.dtsi"
-#include "mt7621_dlink_dir-882-x1.dtsi"
+#include "mt7621_dlink_dir-8xx.dtsi"
+#include "mt7621_dlink_flash-16m-a1.dtsi"
/ {
compatible = "dlink,dir-882-a1", "mediatek,mt7621-soc";
model = "D-Link DIR-882 A1";
};
+
+&leds {
+ usb2 {
+ label = "green:usb2";
+ gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
+ trigger-sources = <&ehci_port2>;
+ linux,default-trigger = "usbport";
+ };
+
+ usb3 {
+ label = "green:usb3";
+ gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
+ trigger-sources = <&xhci_ehci_port1>;
+ linux,default-trigger = "usbport";
+ };
+};
diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-882-r1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-882-r1.dts
index 26b6f34707..9b0cd8e7be 100644
--- a/target/linux/ramips/dts/mt7621_dlink_dir-882-r1.dts
+++ b/target/linux/ramips/dts/mt7621_dlink_dir-882-r1.dts
@@ -1,9 +1,25 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-#include "mt7621_dlink_dir-8xx-r1.dtsi"
-#include "mt7621_dlink_dir-882-x1.dtsi"
+#include "mt7621_dlink_dir-8xx.dtsi"
+#include "mt7621_dlink_flash-16m-r1.dtsi"
/ {
compatible = "dlink,dir-882-r1", "mediatek,mt7621-soc";
model = "D-Link DIR-882 R1";
};
+
+&leds {
+ usb2 {
+ label = "green:usb2";
+ gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
+ trigger-sources = <&ehci_port2>;
+ linux,default-trigger = "usbport";
+ };
+
+ usb3 {
+ label = "green:usb3";
+ gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
+ trigger-sources = <&xhci_ehci_port1>;
+ linux,default-trigger = "usbport";
+ };
+};
diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-882-x1.dtsi b/target/linux/ramips/dts/mt7621_dlink_dir-882-x1.dtsi
deleted file mode 100644
index cafb1df964..0000000000
--- a/target/linux/ramips/dts/mt7621_dlink_dir-882-x1.dtsi
+++ /dev/null
@@ -1,17 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-&leds {
- usb2 {
- label = "green:usb2";
- gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
- trigger-sources = <&ehci_port2>;
- linux,default-trigger = "usbport";
- };
-
- usb3 {
- label = "green:usb3";
- gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
- trigger-sources = <&xhci_ehci_port1>;
- linux,default-trigger = "usbport";
- };
-};
diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-8xx-x1.dtsi b/target/linux/ramips/dts/mt7621_dlink_dir-8xx.dtsi
similarity index 100%
rename from target/linux/ramips/dts/mt7621_dlink_dir-8xx-x1.dtsi
rename to target/linux/ramips/dts/mt7621_dlink_dir-8xx.dtsi
diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-8xx-a1.dtsi b/target/linux/ramips/dts/mt7621_dlink_flash-16m-a1.dtsi
similarity index 94%
rename from target/linux/ramips/dts/mt7621_dlink_dir-8xx-a1.dtsi
rename to target/linux/ramips/dts/mt7621_dlink_flash-16m-a1.dtsi
index 95ef0afcd9..911de595d0 100644
--- a/target/linux/ramips/dts/mt7621_dlink_dir-8xx-a1.dtsi
+++ b/target/linux/ramips/dts/mt7621_dlink_flash-16m-a1.dtsi
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-#include "mt7621_dlink_dir-8xx-x1.dtsi"
-
&spi0 {
status = "okay";
diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-8xx-r1.dtsi b/target/linux/ramips/dts/mt7621_dlink_flash-16m-r1.dtsi
similarity index 94%
rename from target/linux/ramips/dts/mt7621_dlink_dir-8xx-r1.dtsi
rename to target/linux/ramips/dts/mt7621_dlink_flash-16m-r1.dtsi
index e93a06d9fe..3f71ab971c 100644
--- a/target/linux/ramips/dts/mt7621_dlink_dir-8xx-r1.dtsi
+++ b/target/linux/ramips/dts/mt7621_dlink_flash-16m-r1.dtsi
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-#include "mt7621_dlink_dir-8xx-x1.dtsi"
-
&spi0 {
status = "okay";
More information about the lede-commits
mailing list