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

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

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf18a.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf18a.dts
index 23d0b9102511aeb3680cf85a71fcbe20d9538195..d965f2724d3f7e22bf97905dc7bd6db49305c465 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf18a.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf18a.dts
@@ -43,20 +43,23 @@
                };
 
                led_power: led-1 {
-                       label = "blue:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&tlmm 48 GPIO_ACTIVE_HIGH>;
                        default-state = "keep";
                };
 
                led-2 {
                        function = LED_FUNCTION_WLAN;
-                       label = "blue:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&tlmm 23 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "phy0tpt";
                };
 
                led-3 {
-                       label = "red:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&tlmm 26 GPIO_ACTIVE_HIGH>;
                };
 
@@ -238,7 +241,7 @@
 &gmac {
        status = "okay";
        nvmem-cell-names = "mac-address";
-       nvmem-cells = <&macaddr_config_0>;
+       nvmem-cells = <&macaddr_config_0 0>;
 };
 
 &switch {
@@ -251,8 +254,7 @@
        label = "wan";
 
        nvmem-cell-names = "mac-address";
-       nvmem-cells = <&macaddr_config_0>;
-       mac-address-increment = <1>;
+       nvmem-cells = <&macaddr_config_0 1>;
 };
 
 &swport3 {
@@ -282,16 +284,19 @@
                                label = "ART";
                                reg = <0xa0000 0x80000>;
                                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_9000: precal@9000 {
-                                       reg = <0x9000 0x2f20>;
+                                       precal_art_1000: precal@1000 {
+                                               reg = <0x1000 0x2f20>;
+                                       };
+
+                                       precal_art_9000: precal@9000 {
+                                               reg = <0x9000 0x2f20>;
+                                       };
                                };
                        };
 
@@ -299,12 +304,17 @@
                                label = "mac";
                                reg = <0x120000 0x80000>;
                                read-only;
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
 
-                               macaddr_config_0: macaddr@0 {
-                                       reg = <0x0 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_config_0: macaddr@0 {
+                                               compatible = "mac-base";
+                                               reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
                                };
                        };
 
@@ -451,9 +461,8 @@
 &wifi0 {
        status = "okay";
        nvmem-cell-names = "pre-calibration", "mac-address";
-       nvmem-cells = <&precal_art_1000>, <&macaddr_config_0>;
-       mac-address-increment = <2>;
-       qcom,ath10k-calibration-variant = "zte,mf18a";
+       nvmem-cells = <&precal_art_1000>, <&macaddr_config_0 2>;
+       qcom,ath10k-calibration-variant = "ZTE-MF18A";
 };
 
 //* This node is used for 5Ghz on QCA9982 */
@@ -472,8 +481,7 @@
                wifi2: wifi@1,0 {
                        compatible = "pci168c,0040";
                        nvmem-cell-names = "pre-calibration", "mac-address";
-                       nvmem-cells = <&precal_art_9000>, <&macaddr_config_0>;
-                       mac-address-increment = <3>;
+                       nvmem-cells = <&precal_art_9000>, <&macaddr_config_0 3>;
                        qcom,ath10k-calibration-variant = "ZTE-MF18A";
                        reg = <0x00010000 0 0 0 0>;
                };