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 dcbe95c526ba662b6e448f20d6e9c3f00b032bc3..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,13 +49,15 @@
 
                led_power_blue: power_blue {
                        gpios = <&led_gpio 0 GPIO_ACTIVE_HIGH>;
-                       label = "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 = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                };
 
                tp28 {
@@ -83,7 +86,8 @@
 
                wps {
                        gpios = <&led_gpio 10 GPIO_ACTIVE_HIGH>;
-                       label = "blue:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_BLUE>;
                };
 
                voip {
@@ -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";
-               };
        };
 };
 
@@ -267,17 +259,6 @@
                                label = "0:ART";
                                reg = <0x170000 0x10000>;
                                read-only;
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               precal_art_1000: precal@1000 {
-                                       reg = <0x1000 0x2f20>;
-                               };
-
-                               precal_art_5000: precal@5000 {
-                                       reg = <0x5000 0x2f20>;
-                               };
                        };
 
                        partition@180000 {
@@ -387,14 +368,30 @@
 
 &wifi0 {
        status = "okay";
-       nvmem-cell-names = "pre-calibration";
-       nvmem-cells = <&precal_art_1000>;
        qcom,ath10k-calibration-variant = "cellc,rtl30vw";
 };
 
 &wifi1 {
        status = "okay";
-       nvmem-cell-names = "pre-calibration";
-       nvmem-cells = <&precal_art_5000>;
        qcom,ath10k-calibration-variant = "cellc,rtl30vw";
 };
+
+&gmac {
+       status = "okay";
+};
+
+&switch {
+       status = "okay";
+};
+
+&swport3 {
+       status = "okay";
+
+       label = "lan1";
+};
+
+&swport4 {
+       status = "okay";
+
+       label = "lan2";
+};