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

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 b2ba5ecaa9281fa601f577580a748702c25913a9..e02eb9eebf375ac06a585c1246997fe3c650637e 100644 (file)
--- 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 4bfe5ca43c2143494d4af52c1820d55b95b77618..1f1d5824f2f0f120c2805e102e47e540c57abe05 100644 (file)
--- 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 cef0705393772ab35bf818288d7c033bdf2619b2..01739fc258c03654a47bc104fad3372e7e016b6d 100644 (file)
--- 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 26b6f34707577dbe64840edd68e109ce643888ac..9b0cd8e7be8fae46abec6a7de500678c80696c2a 100644 (file)
--- 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 (file)
index cafb1df..0000000
--- 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 95ef0afcd9d5294e0b67afc37a4436ad209759a2..911de595d07772d589bbd5fc3db92c9c18c886e6 100644 (file)
--- 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 e93a06d9fea75a22acb965a91e0f9a11a0e18d4e..3f71ab971ca5d656a03adc6f79895691c658879a 100644 (file)
--- 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";