bmips: dts: improve and align device tree files

Align all the device tree files and follow the same criteria before more
devices are ported from bcm63xx and this goes out of control.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

diff --git a/target/linux/bmips/dts/bcm63167-sercomm-h500-s.dtsi b/target/linux/bmips/dts/bcm63167-sercomm-h500-s.dtsi
index 8e0024a20f52da1a12ae248ae29ad0ae1d460da1..95f330d6c535204490aa5b0d8fb2f4e4518dd758 100644 (file)
--- a/target/linux/bmips/dts/bcm63167-sercomm-h500-s.dtsi
+++ b/target/linux/bmips/dts/bcm63167-sercomm-h500-s.dtsi
@@ -8,10 +8,6 @@
                led-failsafe = &led_power_red;
                led-running = &led_power_green;
                led-upgrade = &led_power_green;
-
-               led-internet = &led_internet_green;
-               led-usb = &led_mobile_green;
-               led-wireless = &led_wireless_green;
        };
 
        keys {
@@ -56,7 +52,7 @@
                label = "red:mobile";
        };
 
-       led_mobile_green: led@1 {
+       led@1 {
                reg = <1>;
                label = "green:mobile";
        };
@@ -64,9 +60,10 @@
        led_power_red: led@8 {
                reg = <8>;
                label = "red:power";
+               panic-indicator;
        };
 
-       led_wireless_green: led@9 {
+       led@9 {
                reg = <9>;
                label = "green:wifi";
        };
@@ -86,7 +83,7 @@
                label = "red:internet";
        };
 
-       led_internet_green: led@15 {
+       led@15 {
                reg = <15>;
                label = "green:internet";
        };

diff --git a/target/linux/bmips/dts/bcm63168-comtrend-vr-3032u.dts b/target/linux/bmips/dts/bcm63168-comtrend-vr-3032u.dts
index 8c4611ee881ed5cd7f16a166abe46fd8c20aa56c..5196f90afa8fa6b8fa4df20cd5c7b83cbb132976 100644 (file)
--- a/target/linux/bmips/dts/bcm63168-comtrend-vr-3032u.dts
+++ b/target/linux/bmips/dts/bcm63168-comtrend-vr-3032u.dts
@@ -11,10 +11,6 @@
                led-failsafe = &led_power_green;
                led-running = &led_power_green;
                led-upgrade = &led_power_green;
-
-               led-dsl = &led_dsl_green;
-               led-internet = &led_internet_green;
-               led-usb = &led_usb_green;
        };
 
        keys {
@@ -78,13 +74,13 @@
                label = "red:internet";
        };
 
-       led_dsl_green: led@3 {
+       led@3 {
                reg = <3>;
                active-low;
                label = "green:dsl";
        };
 
-       led_usb_green: led@4 {
+       led@4 {
                reg = <4>;
                active-low;
                label = "green:usb";
@@ -96,7 +92,7 @@
                label = "green:wps";
        };
 
-       led_internet_green: led@8 {
+       led@8 {
                reg = <8>;
                active-low;
                label = "green:internet";

diff --git a/target/linux/bmips/dts/bcm63168-sercomm-shg2500.dts b/target/linux/bmips/dts/bcm63168-sercomm-shg2500.dts
index bb769b09e1cb14bda9eb4a745463e35a443fed2f..7b0ebf2aefc35d9cde5d745bcca0f37cde7a6204 100644 (file)
--- a/target/linux/bmips/dts/bcm63168-sercomm-shg2500.dts
+++ b/target/linux/bmips/dts/bcm63168-sercomm-shg2500.dts
@@ -11,10 +11,6 @@
                led-failsafe = &led_power_red;
                led-running = &led_power_red;
                led-upgrade = &led_power_red;
-
-               led-internet = &led_internet_green;
-               led-usb = &led_modem_green;
-               led-wireless = &led_wireless_green;
        };
 
        i2c {
@@ -82,7 +78,7 @@
                        label = "red:modem";
                };
 
-               led_modem_green: led@2 {
+               led@2 {
                        reg = <2>;
                        label = "green:modem";
                };
@@ -107,7 +103,7 @@
                        label = "green:phone";
                };
 
-               led_wireless_green: led@7 {
+               led@7 {
                        reg = <7>;
                        label = "green:wifi";
                };
@@ -117,7 +113,7 @@
                        label = "red:power";
                };
 
-               led_internet_green: led@9 {
+               led@9 {
                        reg = <9>;
                        label = "green:internet";
                };

diff --git a/target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts b/target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts
index 8ac37be495cd02363c4c9496cd4e8bd98f6bcb50..45ed6e2a3b71231e4d7c952e7acb0bc36483b846 100644 (file)
--- a/target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts
+++ b/target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts
@@ -11,10 +11,6 @@
                led-failsafe = &led_power_red;
                led-running = &led_power_green;
                led-upgrade = &led_power_green;
-
-               led-dsl = &led_dsl_green;
-               led-internet = &led_internet_green;
-               led-usb = &led_usb_green;
        };
 
        keys {
@@ -130,41 +126,41 @@
                label = "green:power";
        };
 
-       led_usb_green: led@2 {
+       led@2 {
                reg = <2>;
                active-low;
                label = "green:usb";
        };
 
        led@4 {
+               /* EPHY0 Act */
                reg = <4>;
                brcm,hardware-controlled;
                brcm,link-signal-sources = <4>;
-               /* EPHY0 Act */
        };
 
        led@5 {
+               /* EPHY1 Act */
                reg = <5>;
                brcm,hardware-controlled;
                brcm,link-signal-sources = <5>;
-               /* EPHY1 Act */
        };
 
        led@6 {
+               /* EPHY2 Act */
                reg = <6>;
                brcm,hardware-controlled;
                brcm,link-signal-sources = <6>;
-               /* EPHY2 Act */
        };
 
        led@7 {
+               /* EPHY3 Act */
                reg = <7>;
                brcm,hardware-controlled;
                brcm,link-signal-sources = <7>;
-               /* EPHY3 Act */
        };
 
-       led_internet_green: led@8 {
+       led@8 {
                reg = <8>;
                active-low;
                label = "green:internet";
@@ -176,7 +172,7 @@
                label = "red:internet";
        };
 
-       led_dsl_green: led@10 {
+       led@10 {
                reg = <10>;
                active-low;
                label = "green:dsl";
@@ -186,6 +182,7 @@
                reg = <11>;
                active-low;
                label = "red:power";
+               panic-indicator;
        };
 };
 

diff --git a/target/linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts b/target/linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts
index 72802366a0855b5ae5f08a41470861b846709b62..a0d1c117f74755b373dd351b81d0b6b4ea14e671 100644 (file)
--- a/target/linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts
+++ b/target/linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts
@@ -11,9 +11,6 @@
                led-failsafe = &led_power_red;
                led-running = &led_power_green;
                led-upgrade = &led_power_green;
-
-               led-dsl = &led_dsl_green;
-               led-internet = &led_internet_green;
        };
 
        keys {
@@ -129,9 +126,10 @@
        led_power_red: led@4 {
                reg = <4>;
                label = "red:power";
+               panic-indicator;
        };
 
-       led_internet_green: led@7 {
+       led@7 {
                reg = <7>;
                label = "green:internet";
        };
@@ -141,7 +139,7 @@
                label = "green:power";
        };
 
-       led_dsl_green: led@11 {
+       led@11 {
                reg = <11>;
                active-low;
                label = "green:dsl";

diff --git a/target/linux/bmips/dts/bcm6358-huawei-hg556a-b.dts b/target/linux/bmips/dts/bcm6358-huawei-hg556a-b.dts
index 716c6227f8a0680be9812e8f3695ac789436739d..d5f162846d24b55e6726c6d83aa50a84408e78ab 100644 (file)
--- a/target/linux/bmips/dts/bcm6358-huawei-hg556a-b.dts
+++ b/target/linux/bmips/dts/bcm6358-huawei-hg556a-b.dts
@@ -3,17 +3,14 @@
 #include "bcm6358.dtsi"
 
 / {
-       compatible = "huawei,hg556a-b", "brcm,bcm6358";
        model = "Huawei EchoLife HG556a (version B)";
+       compatible = "huawei,hg556a-b", "brcm,bcm6358";
 
        aliases {
                led-boot = &led_power_red;
                led-failsafe = &led_power_red;
                led-running = &led_power_red;
                led-upgrade = &led_power_red;
-
-               led-dsl = &led_dsl_red;
-               led-usb = &led_hspa_red;
        };
 
        keys {
@@ -57,12 +54,12 @@
                        gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
                };
 
-               led_hspa_red: led@1 {
+               led@1 {
                        label = "red:hspa";
                        gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
                };
 
-               led_dsl_red: led@2 {
+               led@2 {
                        label = "red:dsl";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };

diff --git a/target/linux/bmips/dts/bcm6362-huawei-hg253s-v2.dts b/target/linux/bmips/dts/bcm6362-huawei-hg253s-v2.dts
index 2a9a6c559a786a45b3e1f33118444827bbd7a227..f562bcd9b2b24a2eb860728c3edfac9b506266ab 100644 (file)
--- a/target/linux/bmips/dts/bcm6362-huawei-hg253s-v2.dts
+++ b/target/linux/bmips/dts/bcm6362-huawei-hg253s-v2.dts
@@ -10,10 +10,6 @@
                led-boot = &led_phone_green;
                led-failsafe = &led_phone_green;
                led-upgrade = &led_phone_green;
-
-               led-internet = &led_internet_green;
-               led-usb = &led_usb_green;
-               led-wireless = &led_wireless_green;
        };
 
        keys {
@@ -50,7 +46,7 @@
                        gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
                };
 
-               led_usb_green: led@30 {
+               led@30 {
                        label = "green:usb";
                        gpios = <&gpio 30 GPIO_ACTIVE_LOW>;
                };
@@ -74,13 +70,13 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_leds>;
 
-       led_internet_green: led@3 {
+       led@3 {
                reg = <3>;
                active-low;
                label = "green:internet";
        };
 
-       led_wireless_green: led@5 {
+       led@5 {
                reg = <5>;
                active-low;
                label = "green:wifi";

diff --git a/target/linux/bmips/dts/bcm6362-netgear-dgnd3700-v2.dts b/target/linux/bmips/dts/bcm6362-netgear-dgnd3700-v2.dts
index ddcde2b6889df70d6a4e78b1040af7fef62f47dd..46bb3e8bf651f99822a93d286b9d77e86d236e49 100644 (file)
--- a/target/linux/bmips/dts/bcm6362-netgear-dgnd3700-v2.dts
+++ b/target/linux/bmips/dts/bcm6362-netgear-dgnd3700-v2.dts
@@ -11,12 +11,6 @@
                led-failsafe = &led_power_red;
                led-running = &led_power_green;
                led-upgrade = &led_power_green;
-
-               led-dsl = &led_dsl_green;
-               led-ethernet = &led_ethernet_green;
-               led-internet = &led_internet_green;
-               led-usb = &led_usb1_green;
-               led-usb2 = &led_usb2_green;
        };
 
        keys {
@@ -48,7 +42,7 @@
        leds {
                compatible = "gpio-leds";
 
-               led_dsl_green: led@28 {
+               led@28 {
                        label = "green:dsl";
                        gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
                };
@@ -56,6 +50,7 @@
                led_power_red: led@34 {
                        label = "red:power";
                        gpios = <&gpio 34 GPIO_ACTIVE_LOW>;
+                       panic-indicator;
                };
        };
 };
@@ -82,7 +77,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_leds &pinctrl_serial_led>;
 
-       led_internet_green: led@1 {
+       led@1 {
                reg = <1>;
                active-low;
                label = "green:internet";
@@ -99,13 +94,13 @@
                label = "green:wps";
        };
 
-       led_usb1_green: led@10 {
+       led@10 {
                reg = <10>;
                active-low;
                label = "green:usb1";
        };
 
-       led_usb2_green: led@11 {
+       led@11 {
                reg = <11>;
                active-low;
                label = "green:usb2";
@@ -117,7 +112,7 @@
                label = "amber:internet";
        };
 
-       led_ethernet_green: led@13 {
+       led@13 {
                reg = <13>;
                active-low;
                label = "green:ethernet";

diff --git a/target/linux/bmips/dts/bcm6368-comtrend-vr-3025u.dts b/target/linux/bmips/dts/bcm6368-comtrend-vr-3025u.dts
index 60029fe7f84bb4aab8a00f91306de5401f4b90ba..e67db8b6bde631f276ab89943f9e2d9f0b5a1987 100644 (file)
--- a/target/linux/bmips/dts/bcm6368-comtrend-vr-3025u.dts
+++ b/target/linux/bmips/dts/bcm6368-comtrend-vr-3025u.dts
@@ -11,9 +11,6 @@
                led-failsafe = &led_power_red;
                led-running = &led_power_green;
                led-upgrade = &led_power_green;
-
-               led-dsl = &led_dsl_green;
-               led-internet = &led_internet_green;
        };
 
        keys {
@@ -31,12 +28,12 @@
        leds {
                compatible = "gpio-leds";
 
-               led_dsl_green: led@2 {
+               led@2 {
                        label = "green:dsl";
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
 
-               led_internet_green: led@5 {
+               led@5 {
                        label = "green:internet";
                        gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
                };
@@ -49,6 +46,7 @@
                led_power_red: led@24 {
                        label = "red:power";
                        gpios = <&gpio 24 GPIO_ACTIVE_HIGH>;
+                       panic-indicator;
                };
 
                led@31 {

diff --git a/target/linux/bmips/dts/bcm6368-netgear-dgnd3700.dtsi b/target/linux/bmips/dts/bcm6368-netgear-dgnd3700.dtsi
index 2299611d55020feab66d7cd34a2aa9716e341eab..7449455631060181e6566710d59b0f8dcb11e364 100644 (file)
--- a/target/linux/bmips/dts/bcm6368-netgear-dgnd3700.dtsi
+++ b/target/linux/bmips/dts/bcm6368-netgear-dgnd3700.dtsi
@@ -59,14 +59,14 @@
                        gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                };
 
-               /* usb front */
                led@13 {
+                       /* Front USB port */
                        label = "green:usb2";
                        gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
                };
 
-               /* usb back */
                led@14 {
+                       /* Back USB port */
                        label = "green:usb1";
                        gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                };
@@ -85,7 +85,6 @@
                led_power_green: led@24 {
                        label = "green:power";
                        gpios = <&gpio 24 GPIO_ACTIVE_LOW>;
-                       default-state = "on";
                };
 
                led@26 {

diff --git a/target/linux/bmips/dts/bcm6368-observa-vh4032n.dts b/target/linux/bmips/dts/bcm6368-observa-vh4032n.dts
index 4a4cca0982c4d16b716dbd8e7a3908fc6be50ed4..14fbd856f8ffc24a4c6b0bd73622fdde3e62076a 100644 (file)
--- a/target/linux/bmips/dts/bcm6368-observa-vh4032n.dts
+++ b/target/linux/bmips/dts/bcm6368-observa-vh4032n.dts
@@ -58,12 +58,12 @@
                led_power_blue: led@22 {
                        label = "blue:power";
                        gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
-                       default-state = "on";
                };
 
                led_power_red: led@24 {
                        label = "red:power";
                        gpios = <&gpio 24 GPIO_ACTIVE_HIGH>;
+                       panic-indicator;
                };
 
                led@25 {

diff --git a/target/linux/bmips/dts/bcm6369-netgear-evg2000.dts b/target/linux/bmips/dts/bcm6369-netgear-evg2000.dts
index 9f03c9e4dc526bbf3bfbb590e2c8d574b2afae27..460c88f755c2cb5f1f244ff51fb74de278f834a6 100644 (file)
--- a/target/linux/bmips/dts/bcm6369-netgear-evg2000.dts
+++ b/target/linux/bmips/dts/bcm6369-netgear-evg2000.dts
@@ -63,12 +63,12 @@
                led_power_green: led@22 {
                        label = "green:power";
                        gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
-                       default-state = "on";
                };
 
                led_power_red: led@23 {
                        label = "red:power";
                        gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
+                       panic-indicator;
                };
 
                led@24 {