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

[openwrt/staging/jow.git] / target / linux / ipq40xx / files / arch / arm / boot / dts / qcom-ipq4019-orbi.dtsi

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-orbi.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-orbi.dtsi
index bdbee7f83702a80faa881f4ff118c58498ce0389..849df642016ea4a6328499c72f3134e253ce8cea 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-orbi.dtsi
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-orbi.dtsi
@@ -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>
 
 / {
@@ -11,6 +12,7 @@
                led-failsafe = &led_status_red;
                led-running = &led_status_green;
                led-upgrade = &led_status_blue;
+               label-mac-device = &gmac;
        };
 
        soc {
@@ -25,10 +27,6 @@
                        pinctrl-names = "default";
                };
 
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
                counter@4a1000 {
                        compatible = "qcom,qca-gcnt";
                        reg = <0x4a1000 0x4>;
@@ -67,17 +65,6 @@
                watchdog@b017000 {
                        status = "okay";
                };
-
-               ess-switch@c000000 {
-                       status = "okay";
-
-                       switch_lan_bmp = <0x1c>;
-                       switch_wan_bmp = <0x02>;
-               };
-
-               edma@c080000 {
-                       status = "okay";
-               };
        };
 
        keys {
@@ -100,34 +87,40 @@
                compatible = "gpio-leds";
 
                led-0 {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&tlmm 63 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                };
 
                led-1 {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>;
                        panic-indicator;
                };
 
                led_status_green: led-2 {
-                       label = "green:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&tlmm 53 GPIO_ACTIVE_HIGH>;
                };
 
                led_status_red: led-3 {
-                       label = "red:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>;
                };
 
                led_status_blue: led-4 {
-                       label = "blue:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&tlmm 57 GPIO_ACTIVE_HIGH>;
                };
 
                led_status_white: led-5 {
-                       label = "white:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&tlmm 60 GPIO_ACTIVE_HIGH>;
                };
        };
@@ -281,13 +274,40 @@
        status = "okay";
 };
 
-&gmac0 {
-       vlan_tag = <1 0x1c>;
+&gmac {
+       status = "okay";
+};
+
+&switch {
+       status = "okay";
+};
+
+&swport1 {
+       status = "okay";
+
+       label = "wan";
+};
+
+&swport2 {
+       status = "okay";
+
+       label = "lan1";
+};
+
+&swport3 {
+       status = "okay";
+
+       label = "lan2";
+};
+
+&swport4 {
+       status = "okay";
+
+       label = "lan3";
 };
 
-&gmac1 {
-       qcom,phy_mdio_addr = <0>;
-       vlan_tag = <2 0x02>;
+&ethphy4 {
+       status = "disabled";
 };
 
 &pcie0 {