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 cdf0cfe6445bd0e4c615af6c25c3a9d7d6c56758..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>
 
@@ -32,7 +33,6 @@
                led-failsafe = &led_power_orange;
                led-running = &led_power_white;
                led-upgrade = &led_power_blue;
-               label-mac-device = &gmac0;
        };
 
        soc {
@@ -73,19 +73,6 @@
                        status = "okay";
                };
 
-               ess-switch@c000000 {
-                       status = "okay";
-                       switch_lan_bmp = <0x1c>;
-               };
-
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
-               edma@c080000 {
-                       status = "okay";
-               };
-
                usb3@8af8800 {
                        status = "okay";
                };
@@ -95,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>;
                };
 
@@ -254,7 +244,8 @@
                wifi@0,0 {
                        compatible = "qcom,ath10k";
                        reg = <0 0 0 0 0>;
-
+                       nvmem-cell-names = "pre-calibration", "mac-address";
+                       nvmem-cells = <&precal_art_9000>, <&macaddr_orgdata_32>;
                        qcom,ath10k-calibration-variant = "Buffalo-WTR-M2133HP";
                };
        };
@@ -340,10 +331,28 @@
                                read-only;
                        };
 
-                       art: partition@b00000 {
+                       partition@b00000 {
                                label = "ART";
                                reg = <0x0b00000 0x0080000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       precal_art_1000: precal@1000 {
+                                               reg = <0x1000 0x2f20>;
+                                       };
+
+                                       precal_art_5000: precal@5000 {
+                                               reg = <0x5000 0x2f20>;
+                                       };
+
+                                       precal_art_9000: precal@9000 {
+                                               reg = <0x5000 0x2f20>;
+                                       };
+                               };
                        };
 
                        partition@b80000 {
@@ -356,6 +365,25 @@
                                label = "ORGDATA";
                                reg = <0x0c00000 0x0080000>;
                                read-only;
+
+                               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>;
+                                       };
+                               };
                        };
 
                        partition@c80000 {
@@ -386,28 +414,53 @@
 
 &wifi0 {
        status = "okay";
+       nvmem-cell-names = "pre-calibration", "mac-address";
+       nvmem-cells = <&precal_art_1000>, <&macaddr_orgdata_26>;
        qcom,ath10k-calibration-variant = "Buffalo-WTR-M2133HP";
        ieee80211-freq-limit = <2400000 2483000>;
 };
 
 &wifi1 {
        status = "okay";
+       nvmem-cell-names = "pre-calibration", "mac-address";
+       nvmem-cells = <&precal_art_5000>, <&macaddr_orgdata_2c>;
        qcom,ath10k-calibration-variant = "Buffalo-WTR-M2133HP";
 };
 
-&mdio {
+&switch {
        status = "okay";
-       pinctrl-0 = <&mdio_pins>;
-       pinctrl-names = "default";
-       reset-gpios = <&tlmm 47 GPIO_ACTIVE_LOW>;
 };
 
-&gmac0 {
-       mtd-mac-address = <&orgdata 0x20>;
+&swport2 {
+       status = "okay";
+       label = "lan3";
+};
+
+&swport3 {
+       status = "okay";
+       label = "lan2";
+};
+
+&swport4 {
+       status = "okay";
+       label = "lan1";
+};
+
+&swport5 {
+       status = "okay";
 };
 
-&gmac1 {
-       mtd-mac-address = <&orgdata 0x20>;
+&gmac {
+       status = "okay";
+       nvmem-cell-names = "mac-address";
+       nvmem-cells = <&macaddr_orgdata_20>;
+};
+
+&mdio {
+       status = "okay";
+       pinctrl-0 = <&mdio_pins>;
+       pinctrl-names = "default";
+       reset-gpios = <&tlmm 47 GPIO_ACTIVE_LOW>;
 };
 
 &usb3_ss_phy {