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

[openwrt/staging/jow.git] / target / linux / ipq40xx / files / arch / arm / boot / dts / qcom-ipq4019-lhgg-60ad.dts

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-lhgg-60ad.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-lhgg-60ad.dts
index aecbb673bf0236ede3fb8b130ac4c283dc7b0f69..4f0eaa625bc5266d3dea281143b57f1412dbb346 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-lhgg-60ad.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-lhgg-60ad.dts
@@ -18,6 +18,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>
 
 / {
@@ -47,12 +48,6 @@
 
                mdio@90000 {
                        status = "okay";
-
-                       /delete-node/ ethernet-phy@1;
-                       /delete-node/ ethernet-phy@2;
-                       /delete-node/ ethernet-phy@3;
-                       /delete-node/ ethernet-phy@4;
-                       /delete-node/ psgmii-phy@5;
                };
 
                counter@4a1000 {
@@ -85,19 +80,6 @@
                watchdog@b017000 {
                        status = "okay";
                };
-
-               ess-switch@c000000 {
-                       switch_mac_mode = <0x3>; /* mac mode for RGMII RMII */
-                       switch_lan_bmp = <0x0>; /* lan port bitmap */
-                       switch_wan_bmp = <0x10>; /* wan port bitmap */
-               };
-
-               edma@c080000 {
-                       status = "okay";
-                       phy-mode = "rgmii-id";
-                       qcom,num_gmac = <1>;
-                       qcom,single-phy;
-               };
        };
 
        keys {
@@ -114,7 +96,8 @@
                compatible = "gpio-leds";
 
                power: power {
-                       label = "blue:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";
                        panic-indicator;
@@ -126,7 +109,8 @@
                };
 
                wlan {
-                       label = "green:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&tlmm 58 GPIO_ACTIVE_HIGH>;
                };
 
@@ -261,8 +245,40 @@
        };
 };
 
-&gmac0 {
-       qcom,phy_mdio_addr = <0>;
-       qcom,poll_required = <1>;
-       vlan_tag = <0 0x20>;
+&ethphy1 {
+       status = "disabled";
+};
+
+&ethphy2 {
+       status = "disabled";
+};
+
+&ethphy3 {
+       status = "disabled";
+};
+
+&ethphy4 {
+       status = "disabled";
+};
+
+&psgmiiphy {
+       status = "disabled";
+};
+
+&gmac {
+       status = "okay";
+};
+
+&switch {
+       status = "okay";
+
+       /delete-property/ psgmii-ethphy;
+};
+
+&swport5 {
+       status = "okay";
+
+       label = "lan";
+       phy-handle = <&ethphy0>;
+       phy-mode = "rgmii-id";
 };