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

[openwrt/staging/jow.git] / target / linux / ipq40xx / files / arch / arm / boot / dts / qcom-ipq4018-emr3500.dts

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-emr3500.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-emr3500.dts
index 50067aaa91296f1513061bf57a651f08fa00fa32..701dc936f14b20f179864d40e66c8014881f0d47 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-emr3500.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-emr3500.dts
@@ -3,6 +3,7 @@
 #include "qcom-ipq4019.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/soc/qcom,tcsr.h>
 
 / {
@@ -18,10 +19,6 @@
                        status = "okay";
                };
 
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
                tcsr@1949000 {
                        compatible = "qcom,tcsr";
                        reg = <0x1949000 0x100>;
@@ -51,14 +48,6 @@
                watchdog@b017000 {
                        status = "okay";
                };
-
-               ess-switch@c000000 {
-                       status = "okay";
-               };
-
-               edma@c080000 {
-                       status = "okay";
-               };
        };
 
        keys {
@@ -82,22 +71,23 @@
                compatible = "gpio-leds";
 
                power: white {
-                       label = "emr3500:white:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&tlmm 4 GPIO_ACTIVE_HIGH>;
                };
 
                blue {
-                       label = "emr3500:blue";
+                       label = "blue";
                        gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>;
                };
 
                red {
-                       label = "emr3500:red";
+                       label = "red";
                        gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>;
                };
 
                orange {
-                       label = "emr3500:orange";
+                       label = "orange";
                        gpios = <&tlmm 1 GPIO_ACTIVE_HIGH>;
                };
        };
@@ -212,14 +202,6 @@
        status = "okay";
 };
 
-&gmac0 {
-       vlan_tag = <1 0x10>;
-};
-
-&gmac1 {
-       vlan_tag = <2 0x20>;
-};
-
 &usb2_hs_phy {
        status = "okay";
 };