ipq40xx: convert to new LED color/function format where possible

[openwrt/staging/nbd.git] / target / linux / ipq40xx / files / arch / arm / boot / dts / qcom-ipq4019-rtl30vw.dts

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rtl30vw.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rtl30vw.dts
index 2f17424e552c64f0b43c9381148d196601785da3..e2df1d1997609d4935c5bc061ab2f4483d276f15 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rtl30vw.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rtl30vw.dts
@@ -7,6 +7,7 @@
 #include <dt-bindings/soc/qcom,tcsr.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Cell C RTL30VW";
@@ -48,72 +49,75 @@
 
                led_power_blue: power_blue {
                        gpios = <&led_gpio 0 GPIO_ACTIVE_HIGH>;
-                       label = "rtl30vw:blue:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_BLUE>;
                        default-state = "on";
                };
 
                led_power_red: power_red {
                        gpios = <&led_gpio 1 GPIO_ACTIVE_HIGH>;
-                       label = "rtl30vw:red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                };
 
                tp28 {
                        gpios = <&led_gpio 6 GPIO_ACTIVE_LOW>;
-                       label = "rtl30vw:ext:tp28";
+                       label = "ext:tp28";
                        default-state = "keep";
                };
 
                tp27 {
                        gpios = <&led_gpio 7 GPIO_ACTIVE_LOW>;
-                       label = "rtl30vw:ext:tp27";
+                       label = "ext:tp27";
                        default-state = "keep";
                };
 
                wlan2g {
                        gpios = <&led_gpio 8 GPIO_ACTIVE_HIGH>;
-                       label = "rtl30vw:blue:wlan2g";
+                       label = "blue:wlan2g";
                        linux,default-trigger = "phy0tpt";
                };
 
                wlan5g {
                        gpios = <&led_gpio 9 GPIO_ACTIVE_HIGH>;
-                       label = "rtl30vw:blue:wlan5g";
+                       label = "blue:wlan5g";
                        linux,default-trigger = "phy1tpt";
                };
 
                wps {
                        gpios = <&led_gpio 10 GPIO_ACTIVE_HIGH>;
-                       label = "rtl30vw:blue:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_BLUE>;
                };
 
                voip {
                        gpios = <&led_gpio 11 GPIO_ACTIVE_HIGH>;
-                       label = "rtl30vw:blue:voip";
+                       label = "blue:voip";
                };
 
                s1 {
                        gpios = <&led_gpio 12 GPIO_ACTIVE_HIGH>;
-                       label = "rtl30vw:blue:s1";
+                       label = "blue:s1";
                };
 
                s2 {
                        gpios = <&led_gpio 13 GPIO_ACTIVE_HIGH>;
-                       label = "rtl30vw:blue:s2";
+                       label = "blue:s2";
                };
 
                s3 {
                        gpios = <&led_gpio 14 GPIO_ACTIVE_HIGH>;
-                       label = "rtl30vw:blue:s3";
+                       label = "blue:s3";
                };
 
                s4 {
                        gpios = <&led_gpio 15 GPIO_ACTIVE_HIGH>;
-                       label = "rtl30vw:blue:s4";
+                       label = "blue:s4";
                };
 
                signal {
                        gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>;
-                       label = "rtl30vw:red:signal";
+                       label = "red:signal";
                };
        };
 
@@ -142,10 +146,6 @@
                        status = "okay";
                };
 
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
                tcsr@1949000 {
                        compatible = "qcom,tcsr";
                        reg = <0x1949000 0x100>;
@@ -187,14 +187,6 @@
                watchdog@b017000 {
                        status = "okay";
                };
-
-               ess-switch@c000000 {
-                       status = "okay";
-               };
-
-               edma@c080000 {
-                       status = "okay";
-               };
        };
 };
 
@@ -383,3 +375,23 @@
        status = "okay";
        qcom,ath10k-calibration-variant = "cellc,rtl30vw";
 };
+
+&gmac {
+       status = "okay";
+};
+
+&switch {
+       status = "okay";
+};
+
+&swport3 {
+       status = "okay";
+
+       label = "lan1";
+};
+
+&swport4 {
+       status = "okay";
+
+       label = "lan2";
+};