ath79: qcn: convert to nvmem-layout

Allows getting rid of deprecated mac-address-increment.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/target/linux/ath79/dts/qca9563_dlink_covr-p2500-a1.dts b/target/linux/ath79/dts/qca9563_dlink_covr-p2500-a1.dts
index 43113ea7b565d71e06fbd264f0a35df75ade52df..3047c6f4794544ee93b4147740a5f165296e421d 100644 (file)
--- a/target/linux/ath79/dts/qca9563_dlink_covr-p2500-a1.dts
+++ b/target/linux/ath79/dts/qca9563_dlink_covr-p2500-a1.dts
@@ -133,8 +133,6 @@
                                reg = <0xff0000 0x10000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-
                                nvmem-layout {
                                        compatible = "fixed-layout";
                                        #address-cells = <1>;

diff --git a/target/linux/ath79/dts/qcn5502_asus.dtsi b/target/linux/ath79/dts/qcn5502_asus.dtsi
index a2b4a76e92eb2e920d27a2bc865b4f44a4250582..ee3ef18d20b6e74488437bc03e2bcdc19208e485 100644 (file)
--- a/target/linux/ath79/dts/qcn5502_asus.dtsi
+++ b/target/linux/ath79/dts/qcn5502_asus.dtsi
@@ -85,20 +85,22 @@
                                reg = <0x050000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               cal_factory_1000: cal@1000 {
-                                       reg = <0x1000 0x440>;
-                               };
-
-                               macaddr_factory_1002: macaddr@1002 {
-                                       reg = <0x1002 0x6>;
-                               };
-
-                               precal_factory_5000: precal@5000 {
-                                       reg = <0x5000 0x2f20>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       cal_factory_1000: cal@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
+                                       macaddr_factory_1002: macaddr@1002 {
+                                               reg = <0x1002 0x6>;
+                                       };
+
+                                       precal_factory_5000: precal@5000 {
+                                               reg = <0x5000 0x2f20>;
+                                       };
                                };
                        };
                };

diff --git a/target/linux/ath79/dts/qcn5502_netgear_ex7300-v2.dts b/target/linux/ath79/dts/qcn5502_netgear_ex7300-v2.dts
index 4ebbdcc1054d24c0367e15a42b4fd0f4ac87d3dd..32b97a4601371ad7cd2d7553c240c2ddce2a5e38 100644 (file)
--- a/target/linux/ath79/dts/qcn5502_netgear_ex7300-v2.dts
+++ b/target/linux/ath79/dts/qcn5502_netgear_ex7300-v2.dts
@@ -182,20 +182,22 @@
                                label = "artmtd";
                                reg = <0xfe0000 0x10000>;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_artmtd_0: macaddr@0 {
-                                       reg = <0x0 0x6>;
-                               };
-
-                               macaddr_artmtd_6: macaddr@6 {
-                                       reg = <0x6 0x6>;
-                               };
-
-                               macaddr_artmtd_c: macaddr@c {
-                                       reg = <0xc 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_artmtd_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_artmtd_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+
+                                       macaddr_artmtd_c: macaddr@c {
+                                               reg = <0xc 0x6>;
+                                       };
                                };
                        };
 
@@ -204,16 +206,18 @@
                                reg = <0xff0000 0x10000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               cal_art_1000: cal@1000 {
-                                       reg = <0x1000 0x440>;
-                               };
+                                       cal_art_1000: cal@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
 
-                               precal_art_5000: precal@5000 {
-                                       reg = <0x5000 0x2f20>;
+                                       precal_art_5000: precal@5000 {
+                                               reg = <0x5000 0x2f20>;
+                                       };
                                };
                        };
                };

diff --git a/target/linux/ath79/dts/qcn5502_tplink_archer-a9-v6.dts b/target/linux/ath79/dts/qcn5502_tplink_archer-a9-v6.dts
index ef0ea321e07ed4fc97ddc4f5973396a0f363d362..6266f5561be39ccbc7d20f1a146af02315e70e46 100644 (file)
--- a/target/linux/ath79/dts/qcn5502_tplink_archer-a9-v6.dts
+++ b/target/linux/ath79/dts/qcn5502_tplink_archer-a9-v6.dts
@@ -88,7 +88,7 @@
        phy-mode = "sgmii";
        phy-handle = <&phy0>;
 
-       nvmem-cells = <&macaddr_info_8>;
+       nvmem-cells = <&macaddr_info_8 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -118,10 +118,8 @@
                compatible = "pci168c,0046";
                reg = <0 0 0 0 0>;
 
-               nvmem-cells = <&macaddr_info_8>, <&precal_art_5000>;
+               nvmem-cells = <&macaddr_info_8 (-1)>, <&precal_art_5000>;
                nvmem-cell-names = "mac-address", "pre-calibration";
-
-               mac-address-increment = <(-1)>;
        };
 };
 
@@ -162,16 +160,18 @@
                                reg = <0x050000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               cal_art_1000: cal@1000 {
-                                       reg = <0x1000 0x440>;
-                               };
+                                       cal_art_1000: cal@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
 
-                               precal_art_5000: precal@5000 {
-                                       reg = <0x5000 0x2f20>;
+                                       precal_art_5000: precal@5000 {
+                                               reg = <0x5000 0x2f20>;
+                                       };
                                };
                        };
 
@@ -180,12 +180,16 @@
                                reg = <0x060000 0x020000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               macaddr_info_8: macaddr@8 {
-                                       reg = <0x8 0x6>;
+                                       macaddr_info_8: macaddr@8 {
+                                               compatible = "mac-base";
+                                               reg = <0x8 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
                                };
                        };
 
@@ -234,6 +238,6 @@
        /* TODO: missing support in ath9k */
        status = "disabled";
 
-       nvmem-cells = <&cal_art_1000>, <&macaddr_info_8>;
+       nvmem-cells = <&cal_art_1000>, <&macaddr_info_8 0>;
        nvmem-cell-names = "calibration", "mac-address";
 };