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

[openwrt/staging/nbd.git] / target / linux / ipq40xx / files / arch / arm / boot / dts / qcom-ipq4018-magic-2-wifi-next.dts

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-magic-2-wifi-next.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-magic-2-wifi-next.dts
index 2709aef5026080f6ea4e3d306dcc7f771d6c7944..501aed54679df88a8b0714c2b82e3a39af251c3d 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-magic-2-wifi-next.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-magic-2-wifi-next.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>
 
 / {
        model = "devolo Magic 2 WiFi next";
@@ -24,13 +25,6 @@
                        pinctrl-names = "default";
                        reset-gpios = <&tlmm 59 GPIO_ACTIVE_LOW>;
                        reset-delay-us = <2000>;
-
-                       /delete-node/ ethernet-phy@0;
-                       /delete-node/ ethernet-phy@1;
-               };
-
-               ess-psgmii@98000 {
-                       status = "okay";
                };
 
                crypto@8e3a000 {
@@ -41,42 +35,6 @@
                        status = "okay";
                };
 
-               ess-switch@c000000 {
-                       status = "okay";
-                       switch_lan_bmp = <0x3e>;
-                       switch_wan_bmp = <0x0>;
-               };
-
-               edma@c080000 {
-                       status = "okay";
-                       qcom,num_gmac = <3>;
-
-                       gmac0 {
-                               qcom,phy_mdio_addr = <3>;
-                               qcom,poll_required = <1>;
-                               /delete-property/ qcom,forced_speed;
-                               /delete-property/ qcom,forced_duplex;
-                               vlan_tag = <1 0x10>;
-                       };
-
-                       gmac1 {
-                               qcom,phy_mdio_addr = <2>;
-                               qcom,poll_required = <1>;
-                               /delete-property/ qcom,forced_speed;
-                               /delete-property/ qcom,forced_duplex;
-                               vlan_tag = <1 0x08>;
-                       };
-
-                       gmac2 {
-                               local-mac-address = [00 00 00 00 00 00];
-                               qcom,phy_mdio_addr = <4>;
-                               qcom,poll_required = <1>;
-                               /delete-property/ qcom,forced_speed;
-                               /delete-property/ qcom,forced_duplex;
-                               vlan_tag = <1 0x20>;
-                       };
-               };
-
                gpio_export {
                        compatible = "gpio-export";
                        #size-cells = <0>;
@@ -116,7 +74,8 @@
                };
 
                status_wlan {
-                       label = "white:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&tlmm 58 GPIO_ACTIVE_LOW>;
                        default-state = "keep";
                };
@@ -192,6 +151,14 @@
        status = "okay";
 };
 
+&ethphy0 {
+       status = "disabled";
+};
+
+&ethphy1 {
+       status = "disabled";
+};
+
 &wifi0 {
        status = "okay";
        qcom,ath10k-calibration-variant = "devolo,magic-2-wifi-next";
@@ -266,3 +233,26 @@
                };
        };
 };
+
+&gmac {
+       status = "okay";
+};
+
+&switch {
+       status = "okay";
+};
+
+&swport5 {
+       status = "okay";
+       label = "lan1";
+};
+
+&swport3 {
+       status = "okay";
+       label = "lan2";
+};
+
+&swport4 {
+       status = "okay";
+       label = "ghn";
+};