From: Christian Marangi <ansuelsmth@gmail.com>
Date: Wed, 7 Feb 2024 22:59:33 +0000 (+0100)
Subject: ramips: fix dts error in LED color/function conversion
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1765973c406e4d999781b3f5f857ec3e499ee645;p=openwrt%2Fstaging%2Fblogic.git

ramips: fix dts error in LED color/function conversion

Fix DTS error in LED color/function conversion due to a bug in the
conversion script.

Fixes: 19c45b95dbb5 ("ramips: convert to new LED color/function format where possible")
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
---

diff --git a/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dts b/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dts
index acc73a8ec949..19e349528cc4 100644
--- a/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dts
+++ b/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dts
@@ -1,3 +1,5 @@
+#include <dt-bindings/leds/common.h>
+
 #include "mt7620a_lenovo_newifi-y1.dtsi"
 
 / {
@@ -60,6 +62,4 @@
 	nvmem-cell-names = "mac-address";
 
 	mediatek,portmap = "llllw";
-#include <dt-bindings/leds/common.h>
-
 };
diff --git a/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1s.dts b/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1s.dts
index 254472f72cfe..8d0dad10e93b 100644
--- a/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1s.dts
+++ b/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1s.dts
@@ -1,3 +1,5 @@
+#include <dt-bindings/leds/common.h>
+
 #include "mt7620a_lenovo_newifi-y1.dtsi"
 
 / {
@@ -118,6 +120,4 @@
 &gsw {
 	mediatek,port4-gmac;
 	mediatek,ephy-base = /bits/ 8 <8>;
-#include <dt-bindings/leds/common.h>
-
 };
diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts
index 60ab58366fb7..514ab0534a17 100644
--- a/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts
+++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts
@@ -1,3 +1,5 @@
+#include <dt-bindings/leds/common.h>
+
 #include "mt7620a_tplink_archer.dtsi"
 
 / {
@@ -86,6 +88,4 @@
 &wifi {
 	nvmem-cells = <&macaddr_rom_f100 (-1)>;
 	nvmem-cell-names = "mac-address";
-#include <dt-bindings/leds/common.h>
-
 };
diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts
index 86205464abce..9ad16e0cb28f 100644
--- a/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts
+++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts
@@ -1,3 +1,5 @@
+#include <dt-bindings/leds/common.h>
+
 #include "mt7620a_tplink_archer.dtsi"
 
 / {
@@ -65,6 +67,4 @@
 &wifi {
 	nvmem-cells = <&macaddr_rom_f100 (-1)>;
 	nvmem-cell-names = "mac-address";
-#include <dt-bindings/leds/common.h>
-
 };
diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts
index 797710c8841f..fe1324378ef2 100644
--- a/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts
+++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts
@@ -1,3 +1,5 @@
+#include <dt-bindings/leds/common.h>
+
 #include "mt7620a_tplink_archer.dtsi"
 
 / {
@@ -86,6 +88,4 @@
 &wifi {
 	nvmem-cells = <&macaddr_rom_f100 (-1)>;
 	nvmem-cell-names = "mac-address";
-#include <dt-bindings/leds/common.h>
-
 };
diff --git a/target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts b/target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts
index 4e7298e8af1d..fc695df39d9d 100644
--- a/target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts
+++ b/target/linux/ramips/dts/mt7620n_wrtnode_wrtnode.dts
@@ -1,6 +1,7 @@
 #include "mt7620n.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/leds/common.h>
 
 / {
 	compatible = "wrtnode,wrtnode", "ralink,mt7620n-soc";
@@ -107,6 +108,4 @@
 		groups = "ephy", "wled", "pa", "i2c", "wdt", "uartf", "spi refclk";
 		function = "gpio";
 	};
-#include <dt-bindings/leds/common.h>
-
 };
diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
index 1031c3375f44..66e2cfdde778 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
@@ -1,3 +1,5 @@
+#include <dt-bindings/leds/common.h>
+
 #include "mt7628an_tplink_8m.dtsi"
 
 / {
@@ -111,6 +113,4 @@
 		nvmem-cells = <&eeprom_factory_28000>, <&macaddr_factory_f100 (-1)>;
 		nvmem-cell-names = "eeprom", "mac-address";
 	};
-#include <dt-bindings/leds/common.h>
-
 };
diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
index f19f8704adea..c20eb3c46f80 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
@@ -1,3 +1,5 @@
+#include <dt-bindings/leds/common.h>
+
 #include "mt7628an_tplink_8m.dtsi"
 
 / {
@@ -110,6 +112,4 @@
 		nvmem-cells = <&eeprom_factory_28000>, <&macaddr_factory_f100 (-1)>;
 		nvmem-cell-names = "eeprom", "mac-address";
 	};
-#include <dt-bindings/leds/common.h>
-
 };
diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts
index d5a56412f97f..fcdc1d6d373a 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts
@@ -1,3 +1,5 @@
+#include <dt-bindings/leds/common.h>
+
 #include "mt7628an_tplink_8m.dtsi"
 
 / {
@@ -92,6 +94,4 @@
 
 &esw {
 	mediatek,portmap = <0x3e>;
-#include <dt-bindings/leds/common.h>
-
 };
diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts
index af1a758d789b..01d5d756e380 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts
@@ -1,3 +1,5 @@
+#include <dt-bindings/leds/common.h>
+
 #include "mt7628an_tplink_8m.dtsi"
 
 / {
@@ -84,6 +86,4 @@
 
 	nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100 0>;
 	nvmem-cell-names = "eeprom", "mac-address";
-#include <dt-bindings/leds/common.h>
-
 };
diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts
index 1bf826349eb9..408e5fd9563f 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts
@@ -1,3 +1,5 @@
+#include <dt-bindings/leds/common.h>
+
 #include "mt7628an_tplink_8m.dtsi"
 
 / {
@@ -80,6 +82,4 @@
 
 &esw {
 	mediatek,portmap = <0x3e>;
-#include <dt-bindings/leds/common.h>
-
 };
diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts
index 2fda2e9b889a..2e5aabd5818a 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts
@@ -1,3 +1,5 @@
+#include <dt-bindings/leds/common.h>
+
 #include "mt7628an_tplink_8m.dtsi"
 
 / {
@@ -106,6 +108,4 @@
 
 &esw {
 	mediatek,portmap = <0x3e>;
-#include <dt-bindings/leds/common.h>
-
 };
diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts
index dc248689bced..0ded67a1a633 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts
@@ -1,3 +1,5 @@
+#include <dt-bindings/leds/common.h>
+
 #include "mt7628an_tplink_8m.dtsi"
 
 / {
@@ -92,6 +94,4 @@
 
 &esw {
 	mediatek,portmap = <0x3e>;
-#include <dt-bindings/leds/common.h>
-
 };
diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts
index b7aed8132d2f..d280c6b32a72 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts
@@ -1,3 +1,5 @@
+#include <dt-bindings/leds/common.h>
+
 #include "mt7628an_tplink_8m.dtsi"
 
 / {
@@ -107,6 +109,4 @@
 		nvmem-cells = <&eeprom_factory_28000>, <&macaddr_factory_f100 (-1)>;
 		nvmem-cell-names = "eeprom", "mac-address";
 	};
-#include <dt-bindings/leds/common.h>
-
 };
diff --git a/target/linux/ramips/dts/mt7628an_vocore_vocore2-lite.dts b/target/linux/ramips/dts/mt7628an_vocore_vocore2-lite.dts
index e1a1bc599d1f..4a5b0ff63a9b 100644
--- a/target/linux/ramips/dts/mt7628an_vocore_vocore2-lite.dts
+++ b/target/linux/ramips/dts/mt7628an_vocore_vocore2-lite.dts
@@ -1,3 +1,5 @@
+#include <dt-bindings/leds/common.h>
+
 #include "mt7628an_vocore_vocore2.dtsi"
 
 / {
@@ -24,6 +26,4 @@
 
 &firmware {
 	reg = <0x50000 0x7b0000>;
-#include <dt-bindings/leds/common.h>
-
 };
diff --git a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2p.dts b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2p.dts
index b82b740dcd68..2018fe1a5926 100644
--- a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2p.dts
+++ b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2p.dts
@@ -1,3 +1,5 @@
+#include <dt-bindings/leds/common.h>
+
 #include "mt7628an_wrtnode_wrtnode2.dtsi"
 
 / {
@@ -27,6 +29,4 @@
 		groups = "i2c", "gpio";
 		function = "gpio";
 	};
-#include <dt-bindings/leds/common.h>
-
 };
diff --git a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2r.dts b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2r.dts
index 37c2d1e9a4a0..2c479a3840bc 100644
--- a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2r.dts
+++ b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2r.dts
@@ -1,3 +1,5 @@
+#include <dt-bindings/leds/common.h>
+
 #include "mt7628an_wrtnode_wrtnode2.dtsi"
 
 / {
@@ -49,6 +51,4 @@
 		reg = <1>;
 		spi-max-frequency = <10000000>;
 	};
-#include <dt-bindings/leds/common.h>
-
 };
diff --git a/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi b/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi
index 15049e032fd3..8c5a185b0576 100644
--- a/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi
+++ b/target/linux/ramips/dts/rt5350_vocore_vocore.dtsi
@@ -1,6 +1,7 @@
 #include "rt5350.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/leds/common.h>
 
 / {
 	compatible = "vocore,vocore", "ralink,rt5350-soc";
@@ -249,6 +250,4 @@
 		spi-max-frequency = <10000000>;
 		reg = <0>;
 	};
-#include <dt-bindings/leds/common.h>
-
 };