mediatek: filogic: PHY LEDs do have an address, gpio-leds don't

Other than GPIO LEDs, PHY LEDs do have an address.

Fix node names such that all gpio-leds do *not* contain an '@' sign and
PHY leds which do have an address also do contain the '@' sign.

This is done to prevent more copy&paste'ry of non-complaint DT
fragments.

Fixes: 7cbe34170e ("mediatek: add support for the GL.iNet GL-MT3000")
Fixes: fe10f97439 ("filogic: add support for GL.iNet GL-MT6000")
Fixes: e8f7597317 ("mediatek: filogic: add support for Cudy RE3000 v1")
Fixes: c9cb6411c1 ("mediatek: add support for Cudy WR3000 v1")
Fixes: 7560af7647 ("mediatek: filogic: migrate ASUS TUF AX6000 to upstream PHY LED control")
Fixes: 25ea7ff393 ("mediatek: filogic: migrate Acer W6/W6d to upstream PHY LED control")
Fixes: d50d51d74e ("mediatek: filogic: migrate Zyxel NWA50AX Pro to upstream PHY LED control")
Fixes: b88de5d507 ("mediatek: filogic: migrate Zyxel EX5700 to upstream PHY LED control")
Fixes: 63d56af6c6 ("mediatek: filogic: migrate Netgate N60 to upstream PHY LED control")
Fixes: fd76a38190 ("mediatek: filogic: migrate SmartRG Bonanza to upstream PHY LED control")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/target/linux/mediatek/dts/mt7981b-cudy-re3000-v1.dts b/target/linux/mediatek/dts/mt7981b-cudy-re3000-v1.dts
index 4025e5aaa3908bfe1dc5ddb519db7264e0d23315..be0aa2e2f404b86e5234f0659c667dea15fbc7bc 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cudy-re3000-v1.dts
+++ b/target/linux/mediatek/dts/mt7981b-cudy-re3000-v1.dts
@@ -44,31 +44,31 @@
        leds {
                compatible = "gpio-leds";
 
-               led_status: led@0 {
+               led_status: led-0 {
                        function = LED_FUNCTION_STATUS;
                        color = <LED_COLOR_ID_WHITE>;
                        gpios = <&pio 10 GPIO_ACTIVE_LOW>;
                };
 
-               led@1 {
+               led-1 {
                        label = "red:wifi5";
                        gpios = <&pio 7 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };
 
-               led@2 {
+               led-2 {
                        label = "white:wifi2";
                        gpios = <&pio 6 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
-               led@3 {
+               led-3 {
                        function = LED_FUNCTION_LAN;
                        color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pio 9 GPIO_ACTIVE_LOW>;
                };
 
-               led@4 {
+               led-4 {
                        function = LED_FUNCTION_WPS;
                        color = <LED_COLOR_ID_WHITE>;
                        gpios = <&pio 11 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/mediatek/dts/mt7981b-cudy-wr3000-v1.dts b/target/linux/mediatek/dts/mt7981b-cudy-wr3000-v1.dts
index 8af8ef401f43ba31d1d55f5616c79c324ad0c87d..ad53f15eb42ac05c4f7e690338f8b3b5d0ade902 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cudy-wr3000-v1.dts
+++ b/target/linux/mediatek/dts/mt7981b-cudy-wr3000-v1.dts
@@ -42,36 +42,36 @@
        leds {
                compatible = "gpio-leds";
 
-               led_status: led@0 {
+               led_status: led-0 {
                        function = LED_FUNCTION_STATUS;
                        color = <LED_COLOR_ID_BLUE>;
                        gpios = <&pio 10 GPIO_ACTIVE_LOW>;
                };
 
-               led@1 {
+               led-1 {
                        label = "blue:internet";
                        gpios = <&pio 11 GPIO_ACTIVE_LOW>;
                };
 
-               led@2 {
+               led-2 {
                        function = LED_FUNCTION_WAN;
                        color = <LED_COLOR_ID_BLUE>;
                        gpios = <&pio 5 GPIO_ACTIVE_LOW>;
                };
 
-               led@3 {
+               led-3 {
                        function = LED_FUNCTION_LAN;
                        color = <LED_COLOR_ID_BLUE>;
                        gpios = <&pio 9 GPIO_ACTIVE_LOW>;
                };
 
-               led@4 {
+               led-4 {
                        label = "blue:wifi2";
                        gpios = <&pio 6 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
-               led@5 {
+               led-5 {
                        label = "blue:wifi5";
                        gpios = <&pio 7 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";

diff --git a/target/linux/mediatek/dts/mt7981b-glinet-gl-mt3000.dts b/target/linux/mediatek/dts/mt7981b-glinet-gl-mt3000.dts
index 727179892149b34f7a1aaba0870e0741f9cb9b9d..5e718069a28ac6a8d99c0fbea961b8156a00ed36 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-glinet-gl-mt3000.dts
+++ b/target/linux/mediatek/dts/mt7981b-glinet-gl-mt3000.dts
@@ -40,12 +40,12 @@
        leds {
                compatible = "gpio-leds";
 
-               led_lightblue: led@0 {
+               led_lightblue: led-0 {
                        label = "blue:run";
                        gpios = <&pio 31 GPIO_ACTIVE_LOW>;
                };
 
-               led_white: led@1 {
+               led_white: led-1 {
                        label = "white:system";
                        gpios = <&pio 30 GPIO_ACTIVE_LOW>;
                };

diff --git a/target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts b/target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts
index ef72ca4ba37b79c9b9712f32b86e5477818095a9..887455988ac1f5d68136e249170d4dd56e251ec5 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts
+++ b/target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts
@@ -33,17 +33,17 @@
        leds {
                compatible = "gpio-leds";
 
-               led_green: led@0 {
+               led_green: led-0 {
                        label = "green:system";
                        gpios = <&pio 4 GPIO_ACTIVE_HIGH>;
                };
 
-               led@1 {
+               led-1 {
                        label = "blue:system";
                        gpios = <&pio 6 GPIO_ACTIVE_HIGH>;
                };
 
-               led_red: led@2 {
+               led_red: led-2 {
                        label = "red:system";
                        gpios = <&pio 7 GPIO_ACTIVE_HIGH>;
                };
@@ -89,13 +89,13 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
 
-                       led-0 {
+                       led@0 {
                                reg = <0>;
                                color = <LED_COLOR_ID_AMBER>;
                                function = LED_FUNCTION_WAN;
                        };
 
-                       led-3 {
+                       led@3 {
                                reg = <3>;
                                color = <LED_COLOR_ID_GREEN>;
                                function = LED_FUNCTION_WAN;

diff --git a/target/linux/mediatek/dts/mt7986a-acer-predator-w6.dts b/target/linux/mediatek/dts/mt7986a-acer-predator-w6.dts
index 2fcbf3aa9643c56acc280eca9755b2176058c787..db3d8a4249c8f0a0c189426501c352c8cbea683e 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-acer-predator-w6.dts
+++ b/target/linux/mediatek/dts/mt7986a-acer-predator-w6.dts
@@ -191,13 +191,13 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
 
-                       led-2 {
+                       led@2 {
                                reg = <2>;
                                color = <LED_COLOR_ID_AMBER>;
                                function = LED_FUNCTION_WAN;
                        };
 
-                       led-3 {
+                       led@3 {
                                reg = <3>;
                                color = <LED_COLOR_ID_GREEN>;
                                function = LED_FUNCTION_WAN;

diff --git a/target/linux/mediatek/dts/mt7986a-acer-predator-w6d.dts b/target/linux/mediatek/dts/mt7986a-acer-predator-w6d.dts
index 275f4134deec058f46a258962ff385e0f35df964..4205220b3e2a6c6c228a8338bd7a244d4a0e97eb 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-acer-predator-w6d.dts
+++ b/target/linux/mediatek/dts/mt7986a-acer-predator-w6d.dts
@@ -177,13 +177,13 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
 
-                       led-2 {
+                       led@2 {
                                reg = <2>;
                                color = <LED_COLOR_ID_AMBER>;
                                function = LED_FUNCTION_WAN;
                        };
 
-                       led-3 {
+                       led@3 {
                                reg = <3>;
                                color = <LED_COLOR_ID_GREEN>;
                                function = LED_FUNCTION_WAN;

diff --git a/target/linux/mediatek/dts/mt7986a-asus-tuf-ax6000.dts b/target/linux/mediatek/dts/mt7986a-asus-tuf-ax6000.dts
index 5a615aa238e585e74ffff0bb7c2889998f583864..4d5c8410a3cdc060b9b9111a257e29e6e89673e1 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-asus-tuf-ax6000.dts
+++ b/target/linux/mediatek/dts/mt7986a-asus-tuf-ax6000.dts
@@ -150,7 +150,7 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
 
-                       led-0 {
+                       led@0 {
                                reg = <0>;
                                active-high;
                                color = <LED_COLOR_ID_WHITE>;
@@ -167,7 +167,7 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
 
-                       led-0 {
+                       led@0 {
                                reg = <0>;
                                color = <LED_COLOR_ID_WHITE>;
                                function = LED_FUNCTION_WAN;

diff --git a/target/linux/mediatek/dts/mt7986a-glinet-gl-mt6000.dts b/target/linux/mediatek/dts/mt7986a-glinet-gl-mt6000.dts
index fe55f2ea3a34a79e5f0c8bd03b86ccc973f89e55..04b690d6adbcfafc2616d1d9b864dfecf6c87ad1 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-glinet-gl-mt6000.dts
+++ b/target/linux/mediatek/dts/mt7986a-glinet-gl-mt6000.dts
@@ -56,12 +56,12 @@
        leds {
                compatible = "gpio-leds";
 
-               led_blue: led@0 {
+               led_blue: led-0 {
                        label = "blue:run";
                        gpios = <&pio 38 GPIO_ACTIVE_LOW>;
                };
 
-               led_white: led@1 {
+               led_white: led-1 {
                        label = "white:system";
                        gpios = <&pio 37 GPIO_ACTIVE_LOW>;
                };

diff --git a/target/linux/mediatek/dts/mt7986a-netcore-n60.dts b/target/linux/mediatek/dts/mt7986a-netcore-n60.dts
index 9686b43b8d428adf6918be482cf6188853c9ebad..484c93d4a78c36d46e52213021bb126832d54140 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-netcore-n60.dts
+++ b/target/linux/mediatek/dts/mt7986a-netcore-n60.dts
@@ -114,7 +114,7 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
 
-                       led-3 {
+                       led@3 {
                                reg = <3>;
                                color = <LED_COLOR_ID_GREEN>;
                                function = LED_FUNCTION_WAN;

diff --git a/target/linux/mediatek/dts/mt7986a-smartrg-bonanza-peak.dtsi b/target/linux/mediatek/dts/mt7986a-smartrg-bonanza-peak.dtsi
index 8eaf5fb94e24cd5000c6874963950d92edd264f1..e5ae78df4d46ae5cca944cad6f17a193e6e3c6d0 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-smartrg-bonanza-peak.dtsi
+++ b/target/linux/mediatek/dts/mt7986a-smartrg-bonanza-peak.dtsi
@@ -224,14 +224,14 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
 
-                       led-0 {
+                       led@0 {
                                reg = <0>;
                                active-high;
                                color = <LED_COLOR_ID_AMBER>;
                                function = LED_FUNCTION_LAN;
                        };
 
-                       led-1 {
+                       led@1 {
                                reg = <1>;
                                active-high;
                                color = <LED_COLOR_ID_GREEN>;
@@ -239,7 +239,7 @@
                                function-enumerator = <0>;
                        };
 
-                       led-2 {
+                       led@2 {
                                reg = <2>;
                                active-high;
                                color = <LED_COLOR_ID_GREEN>;
@@ -258,14 +258,14 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
 
-                       led-0 {
+                       led@0 {
                                reg = <0>;
                                active-high;
                                color = <LED_COLOR_ID_AMBER>;
                                function = LED_FUNCTION_WAN;
                        };
 
-                       led-1 {
+                       led@1 {
                                reg = <1>;
                                active-high;
                                color = <LED_COLOR_ID_GREEN>;
@@ -273,7 +273,7 @@
                                function-enumerator = <0>;
                        };
 
-                       led-2 {
+                       led@2 {
                                reg = <2>;
                                active-high;
                                color = <LED_COLOR_ID_GREEN>;

diff --git a/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts b/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts
index c36cc58d5d9474f167a8bac0a8f97eb289a89c7a..29d37e93157e56bc8b7e5c65882446ab198ac9ea 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts
+++ b/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts
@@ -163,13 +163,13 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
 
-                       led-0 {
+                       led@0 {
                                reg = <0>;
                                color = <LED_COLOR_ID_GREEN>;
                                function = LED_FUNCTION_LAN;
                        };
 
-                       led-1 {
+                       led@1 {
                                reg = <1>;
                                color = <LED_COLOR_ID_AMBER>;
                                function = LED_FUNCTION_LAN;
@@ -185,13 +185,13 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
 
-                       led-0 {
+                       led@0 {
                                reg = <0>;
                                color = <LED_COLOR_ID_GREEN>;
                                function = LED_FUNCTION_WAN;
                        };
 
-                       led-1 {
+                       led@1 {
                                reg = <1>;
                                color = <LED_COLOR_ID_AMBER>;
                                function = LED_FUNCTION_WAN;