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

[openwrt/staging/nbd.git] / target / linux / ipq40xx / files / arch / arm / boot / dts / qcom-ipq4019-wtr-m2133hp.dts

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-wtr-m2133hp.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-wtr-m2133hp.dts
index f1d58ccba916d2db37614be2f91edecfa2a25fb7..00b5897b7dbac10baa800cd39083498ef36fdc9f 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-wtr-m2133hp.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-wtr-m2133hp.dts
@@ -6,6 +6,7 @@
 
 #include "qcom-ipq4019.dtsi"
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/soc/qcom,tcsr.h>
 
@@ -81,17 +82,20 @@
                compatible = "gpio-leds";
 
                led_power_white: power_white {
-                       label = "white:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&tlmm 40 GPIO_ACTIVE_HIGH>;
                };
 
                led_power_orange: power_orange {
-                       label = "orange:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_ORANGE>;
                        gpios = <&tlmm 25 GPIO_ACTIVE_HIGH>;
                };
 
                led_power_blue: power_blue {
-                       label = "blue:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&tlmm 43 GPIO_ACTIVE_HIGH>;
                };
 
@@ -331,20 +335,23 @@
                                label = "ART";
                                reg = <0x0b00000 0x0080000>;
                                read-only;
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
 
-                               precal_art_1000: precal@1000 {
-                                       reg = <0x1000 0x2f20>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               precal_art_5000: precal@5000 {
-                                       reg = <0x5000 0x2f20>;
-                               };
+                                       precal_art_1000: precal@1000 {
+                                               reg = <0x1000 0x2f20>;
+                                       };
+
+                                       precal_art_5000: precal@5000 {
+                                               reg = <0x5000 0x2f20>;
+                                       };
 
-                               precal_art_9000: precal@9000 {
-                                       reg = <0x5000 0x2f20>;
+                                       precal_art_9000: precal@9000 {
+                                               reg = <0x5000 0x2f20>;
+                                       };
                                };
                        };
 
@@ -358,21 +365,24 @@
                                label = "ORGDATA";
                                reg = <0x0c00000 0x0080000>;
                                read-only;
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
 
-                               macaddr_orgdata_20: macaddr@20 {
-                                       reg = <0x20 0x6>;
-                               };
-                               macaddr_orgdata_26: macaddr@26 {
-                                       reg = <0x26 0x6>;
-                               };
-                               macaddr_orgdata_2c: macaddr@2c {
-                                       reg = <0x2c 0x6>;
-                               };
-                               macaddr_orgdata_32: macaddr@32 {
-                                       reg = <0x32 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_orgdata_20: macaddr@20 {
+                                               reg = <0x20 0x6>;
+                                       };
+                                       macaddr_orgdata_26: macaddr@26 {
+                                               reg = <0x26 0x6>;
+                                       };
+                                       macaddr_orgdata_2c: macaddr@2c {
+                                               reg = <0x2c 0x6>;
+                                       };
+                                       macaddr_orgdata_32: macaddr@32 {
+                                               reg = <0x32 0x6>;
+                                       };
                                };
                        };
 
@@ -417,6 +427,35 @@
        qcom,ath10k-calibration-variant = "Buffalo-WTR-M2133HP";
 };
 
+&switch {
+       status = "okay";
+};
+
+&swport2 {
+       status = "okay";
+       label = "lan3";
+};
+
+&swport3 {
+       status = "okay";
+       label = "lan2";
+};
+
+&swport4 {
+       status = "okay";
+       label = "lan1";
+};
+
+&swport5 {
+       status = "okay";
+};
+
+&gmac {
+       status = "okay";
+       nvmem-cell-names = "mac-address";
+       nvmem-cells = <&macaddr_orgdata_20>;
+};
+
 &mdio {
        status = "okay";
        pinctrl-0 = <&mdio_pins>;