ipq806x: remove mac-address-increment

It's deprecated.

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

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8062-wg2600hp3.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8062-wg2600hp3.dts
index 04f4b7cd023834769244f1892b254268fad78360..0c669dcbfe62c75bb0bf3c191fb7457986c0993b 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8062-wg2600hp3.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8062-wg2600hp3.dts
@@ -319,22 +319,47 @@
                                        label = "PRODUCTDATA";
                                        reg = <0x02b0000 0x0030000>;
                                        read-only;
+
+                                       nvmem-layout {
+                                               compatible = "fixed-layout";
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+
+                                               macaddr_factory_0: macaddr@0 {
+                                                       reg = <0x0 0x6>;
+                                               };
+
+                                               macaddr_factory_6: macaddr@6 {
+                                                       reg = <0x6 0x6>;
+                                               };
+
+                                               macaddr_PRODUCTDATA_c: macaddr@c {
+                                                       reg = <0xc 0x6>;
+                                               };
+
+                                               macaddr_PRODUCTDATA_12: macaddr@12 {
+                                                       reg = <0x12 0x6>;
+                                               };
+                                       };
                                };
 
                                partition@2e0000 {
                                        label = "ART";
                                        reg = <0x02e0000 0x0040000>;
                                        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>;
+                                               };
                                        };
                                };
 
@@ -691,28 +716,6 @@
        };
 };
 
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_factory_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-
-       macaddr_PRODUCTDATA_c: macaddr@c {
-               reg = <0xc 0x6>;
-       };
-
-       macaddr_PRODUCTDATA_12: macaddr@12 {
-               reg = <0x12 0x6>;
-       };
-};
-
 &hs_phy_0 {
        status = "okay";
 };

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-ad7200-c2600.dtsi b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-ad7200-c2600.dtsi
index c425c9cd2ed314df72703fcd0c7760945127db25..f306201754efb26e5df052757df175d4146beb04 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-ad7200-c2600.dtsi
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-ad7200-c2600.dtsi
@@ -162,16 +162,19 @@
                                        label = "radio";
                                        reg = <0x1b0000 0x40000>;
                                        read-only;
-                                       compatible = "nvmem-cells";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
 
-                                       precal_radio_1000: precal@1000 {
-                                               reg = <0x1000 0x2f20>;
-                                       };
+                                       nvmem-layout {
+                                               compatible = "fixed-layout";
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+
+                                               precal_radio_1000: precal@1000 {
+                                                       reg = <0x1000 0x2f20>;
+                                               };
 
-                                       precal_radio_5000: precal@5000 {
-                                               reg = <0x5000 0x2f20>;
+                                               precal_radio_5000: precal@5000 {
+                                                       reg = <0x5000 0x2f20>;
+                                               };
                                        };
                                };
 
@@ -189,6 +192,18 @@
                                        label = "default-mac";
                                        reg = <0x1ef0000 0x00200>;
                                        read-only;
+
+                                       nvmem-layout {
+                                               compatible = "fixed-layout";
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+
+                                               macaddr_defaultmac_8: macaddr@8 {
+                                                       compatible = "mac-base";
+                                                       reg = <0x8 0x6>;
+                                                       #nvmem-cell-cells = <1>;
+                                               };
+                                       };
                                };
 
                                partition@1ef0200 {
@@ -304,9 +319,8 @@
                        compatible = "pci168c,0040";
                        reg = <0x00010000 0 0 0 0>;
 
-                       nvmem-cells = <&macaddr_defaultmac_8>, <&precal_radio_1000>;
+                       nvmem-cells = <&macaddr_defaultmac_8 (-1)>, <&precal_radio_1000>;
                        nvmem-cell-names = "mac-address", "pre-calibration";
-                       mac-address-increment = <(-1)>;
                };
        };
 };
@@ -325,7 +339,7 @@
                        compatible = "pci168c,0040";
                        reg = <0x00010000 0 0 0 0>;
 
-                       nvmem-cells = <&macaddr_defaultmac_8>, <&precal_radio_5000>;
+                       nvmem-cells = <&macaddr_defaultmac_8 0>, <&precal_radio_5000>;
                        nvmem-cell-names = "mac-address", "pre-calibration";
                };
        };
@@ -445,9 +459,8 @@
        pinctrl-0 = <&rgmii2_pins>;
        pinctrl-names = "default";
 
-       nvmem-cells = <&macaddr_defaultmac_8>;
+       nvmem-cells = <&macaddr_defaultmac_8 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 
        fixed-link {
                speed = <1000>;
@@ -460,7 +473,7 @@
        phy-mode = "sgmii";
        qcom,id = <2>;
 
-       nvmem-cells = <&macaddr_defaultmac_8>;
+       nvmem-cells = <&macaddr_defaultmac_8 0>;
        nvmem-cell-names = "mac-address";
 
        fixed-link {
@@ -472,13 +485,3 @@
 &adm_dma {
        status = "okay";
 };
-
-&defaultmac {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_defaultmac_8: macaddr@8 {
-               reg = <0x8 0x6>;
-       };
-};

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-d7800.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
index 7e4e0c829c27230a09a97932c274e359486da723..18563c19f7bfdab600e8eb53d7d581cbeadbb388 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
@@ -209,9 +209,8 @@
                        compatible = "pci168c,0040";
                        reg = <0x00010000 0 0 0 0>;
 
-                       nvmem-cells = <&macaddr_art_6>, <&precal_art_1000>;
+                       nvmem-cells = <&macaddr_art_6 1>, <&precal_art_1000>;
                        nvmem-cell-names = "mac-address", "pre-calibration";
-                       mac-address-increment = <(1)>;
                };
        };
 };
@@ -233,9 +232,8 @@
                        compatible = "pci168c,0040";
                        reg = <0x00010000 0 0 0 0>;
 
-                       nvmem-cells = <&macaddr_art_6>, <&precal_art_5000>;
+                       nvmem-cells = <&macaddr_art_6 2>, <&precal_art_5000>;
                        nvmem-cell-names = "mac-address", "pre-calibration";
-                       mac-address-increment = <(2)>;
                };
        };
 };
@@ -288,24 +286,29 @@
                                label = "art";
                                reg = <0x1200000 0x0140000>;
                                read-only;
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
 
-                               macaddr_art_0: macaddr@0 {
-                                       reg = <0x0 0x6>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               macaddr_art_6: macaddr@6 {
-                                       reg = <0x6 0x6>;
-                               };
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
 
-                               precal_art_1000: precal@1000 {
-                                       reg = <0x1000 0x2f20>;
-                               };
+                                       macaddr_art_6: macaddr@6 {
+                                               compatible = "mac-base";
+                                               reg = <0x6 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+
+                                       precal_art_1000: precal@1000 {
+                                               reg = <0x1000 0x2f20>;
+                                       };
 
-                               precal_art_5000: precal@5000 {
-                                       reg = <0x5000 0x2f20>;
+                                       precal_art_5000: precal@5000 {
+                                               reg = <0x5000 0x2f20>;
+                                       };
                                };
                        };
 
@@ -448,7 +451,7 @@
        pinctrl-0 = <&rgmii2_pins>;
        pinctrl-names = "default";
 
-       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cells = <&macaddr_art_6 0>;
        nvmem-cell-names = "mac-address";
 
        fixed-link {

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-r7500.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
index c58c289d35d9f5eb4387b2e77d1fc3f17fd8eb77..41360b4a55b5964fde0e6dad28f95745c278e27d 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
@@ -221,6 +221,20 @@
                                label = "art";
                                reg = <0x1200000 0x0140000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_art_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+                               };
                        };
 
                        kernel@1340000 {
@@ -393,17 +407,3 @@
 &adm_dma {
        status = "okay";
 };
-
-&art {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_art_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_art_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
index 719a423cad3d695ac46475b23038b3b5126d1951..47f653ac76377ebd504b7eaae9ee1a7d1f518ab3 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
@@ -213,9 +213,8 @@
                        compatible = "pci168c,0040";
                        reg = <0x00010000 0 0 0 0>;
 
-                       nvmem-cells = <&macaddr_art_6>, <&precal_art_1000>;
+                       nvmem-cells = <&macaddr_art_6 1>, <&precal_art_1000>;
                        nvmem-cell-names = "mac-address", "pre-calibration";
-                       mac-address-increment = <(1)>;
                };
        };
 };
@@ -237,9 +236,8 @@
                        compatible = "pci168c,0040";
                        reg = <0x00010000 0 0 0 0>;
 
-                       nvmem-cells = <&macaddr_art_6>, <&precal_art_5000>;
+                       nvmem-cells = <&macaddr_art_6 2>, <&precal_art_5000>;
                        nvmem-cell-names = "mac-address", "pre-calibration";
-                       mac-address-increment = <(2)>;
                };
        };
 };
@@ -285,24 +283,29 @@
                                label = "art";
                                reg = <0x1200000 0x0140000>;
                                read-only;
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
 
-                               macaddr_art_0: macaddr@0 {
-                                       reg = <0x0 0x6>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               macaddr_art_6: macaddr@6 {
-                                       reg = <0x6 0x6>;
-                               };
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
 
-                               precal_art_1000: precal@1000 {
-                                       reg = <0x1000 0x2f20>;
-                               };
+                                       macaddr_art_6: macaddr@6 {
+                                               compatible = "mac-base";
+                                               reg = <0x6 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+
+                                       precal_art_1000: precal@1000 {
+                                               reg = <0x1000 0x2f20>;
+                                       };
 
-                               precal_art_5000: precal@5000 {
-                                       reg = <0x5000 0x2f20>;
+                                       precal_art_5000: precal@5000 {
+                                               reg = <0x5000 0x2f20>;
+                                       };
                                };
                        };
 
@@ -445,7 +448,7 @@
        pinctrl-0 = <&rgmii2_pins>;
        pinctrl-names = "default";
 
-       nvmem-cells = <&macaddr_art_6>;
+       nvmem-cells = <&macaddr_art_6 0>;
        nvmem-cell-names = "mac-address";
 
        fixed-link {

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-unifi-ac-hd.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-unifi-ac-hd.dts
index 90927ddb856cc8a8ea1aa53998a7294b79364538..fac41897d4fcb2ebc5efa6c1771377839b97af99 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-unifi-ac-hd.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-unifi-ac-hd.dts
@@ -179,6 +179,20 @@
                                        label = "EEPROM";
                                        reg = <0x1c0000 0x10000>;
                                        read-only;
+
+                                       nvmem-layout {
+                                               compatible = "fixed-layout";
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+
+                                               macaddr_eeprom_0: macaddr@0 {
+                                                       reg = <0x0 0x6>;
+                                               };
+
+                                               macaddr_eeprom_6: macaddr@6 {
+                                                       reg = <0x6 0x6>;
+                                               };
+                                       };
                                };
 
                                partition@1d0000 {
@@ -299,17 +313,3 @@
 &usb3_1 {
        status = "okay";
 };
-
-&eeprom {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_eeprom_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_eeprom_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
index 8104ce18298439145c896fcce2a988f0bcb39bbb..ac62470df4824117a9bd6176424ffb303cdfeb4d 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
@@ -268,12 +268,16 @@
                                        reg = <0xfaf100 0x00200>;
                                        read-only;
 
-                                       compatible = "nvmem-cells";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       macaddr_defaultmac_0: macaddr@0 {
-                                               reg = <0x0 0x6>;
+                                       nvmem-layout {
+                                               compatible = "fixed-layout";
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+
+                                               macaddr_defaultmac_0: macaddr@0 {
+                                                       compatible = "mac-base";
+                                                       reg = <0x0 0x6>;
+                                                       #nvmem-cell-cells = <1>;
+                                               };
                                        };
                                };
 
@@ -282,16 +286,18 @@
                                        reg = <0xfc0000 0x40000>;
                                        read-only;
 
-                                       compatible = "nvmem-cells";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
+                                       nvmem-layout {
+                                               compatible = "fixed-layout";
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
 
-                                       precal_ART_1000: precal@1000 {
-                                               reg = <0x1000 0x2f20>;
-                                       };
+                                               precal_ART_1000: precal@1000 {
+                                                       reg = <0x1000 0x2f20>;
+                                               };
 
-                                       precal_ART_5000: precal@5000 {
-                                               reg = <0x5000 0x2f20>;
+                                               precal_ART_5000: precal@5000 {
+                                                       reg = <0x5000 0x2f20>;
+                                               };
                                        };
                                };
                        };
@@ -336,9 +342,8 @@
                        compatible = "pci168c,0040";
                        reg = <0x00010000 0 0 0 0>;
 
-                       nvmem-cells = <&macaddr_defaultmac_0>, <&precal_ART_1000>;
+                       nvmem-cells = <&macaddr_defaultmac_0 (-1)>, <&precal_ART_1000>;
                        nvmem-cell-names = "mac-address", "pre-calibration";
-                       mac-address-increment = <(-1)>;
                };
        };
 };
@@ -357,7 +362,7 @@
                        compatible = "pci168c,0040";
                        reg = <0x00010000 0 0 0 0>;
 
-                       nvmem-cells = <&macaddr_defaultmac_0>, <&precal_ART_5000>;
+                       nvmem-cells = <&macaddr_defaultmac_0 0>, <&precal_ART_5000>;
                        nvmem-cell-names = "mac-address", "pre-calibration";
                };
        };
@@ -477,9 +482,8 @@
        pinctrl-0 = <&rgmii2_pins>;
        pinctrl-names = "default";
 
-       nvmem-cells = <&macaddr_defaultmac_0>;
+       nvmem-cells = <&macaddr_defaultmac_0 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 
        fixed-link {
                speed = <1000>;
@@ -492,7 +496,7 @@
        phy-mode = "sgmii";
        qcom,id = <2>;
 
-       nvmem-cells = <&macaddr_defaultmac_0>;
+       nvmem-cells = <&macaddr_defaultmac_0 0>;
        nvmem-cell-names = "mac-address";
 
        fixed-link {

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
index 87b05b57ba977947f271b439236b8ef41c8f3951..a376eb0e2fe9255e6b1b05a6d601534f2a5296b5 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
@@ -360,22 +360,47 @@ switch@10 {
                                        label = "PRODUCTDATA";
                                        reg = <0x2b0000 0x30000>;
                                        read-only;
+
+                                       nvmem-layout {
+                                               compatible = "fixed-layout";
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+
+                                               macaddr_PRODUCTDATA_0: macaddr@0 {
+                                                       reg = <0x0 0x6>;
+                                               };
+
+                                               macaddr_PRODUCTDATA_6: macaddr@6 {
+                                                       reg = <0x6 0x6>;
+                                               };
+
+                                               macaddr_PRODUCTDATA_c: macaddr@c {
+                                                       reg = <0xc 0x6>;
+                                               };
+
+                                               macaddr_PRODUCTDATA_12: macaddr@12 {
+                                                       reg = <0x12 0x6>;
+                                               };
+                                       };
                                };
 
                                ART@2e0000 {
                                        label = "ART";
                                        reg = <0x2e0000 0x40000>;
                                        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>;
+                                               };
                                        };
                                };
 
@@ -522,25 +547,3 @@ switch@10 {
                };
        };
 };
-
-&PRODUCTDATA {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_PRODUCTDATA_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_PRODUCTDATA_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-
-       macaddr_PRODUCTDATA_c: macaddr@c {
-               reg = <0xc 0x6>;
-       };
-
-       macaddr_PRODUCTDATA_12: macaddr@12 {
-               reg = <0x12 0x6>;
-       };
-};

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
index 2d761ee3557d2bef9f05827c1e985789deb5d301..d484ba9c6036d0c505db7293b7953a9faa034d6a 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
@@ -420,32 +420,34 @@
                                        reg = <0x180000 0x40000>;
                                        read-only;
 
-                                       compatible = "nvmem-cells";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       macaddr_ART_0: macaddr@0 {
-                                               reg = <0x0 0x6>;
-                                       };
-
-                                       macaddr_ART_6: macaddr@6 {
-                                               reg = <0x6 0x6>;
-                                       };
-
-                                       macaddr_ART_18: macaddr@18 {
-                                               reg = <0x18 0x6>;
-                                       };
-
-                                       macaddr_ART_1e: macaddr@1e {
-                                               reg = <0x1e 0x6>;
-                                       };
-
-                                       precal_ART_1000: precal@1000 {
-                                               reg = <0x1000 0x2f20>;
-                                       };
-
-                                       precal_ART_5000: precal@5000 {
-                                               reg = <0x5000 0x2f20>;
+                                       nvmem-layout {
+                                               compatible = "fixed-layout";
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+
+                                               macaddr_ART_0: macaddr@0 {
+                                                       reg = <0x0 0x6>;
+                                               };
+
+                                               macaddr_ART_6: macaddr@6 {
+                                                       reg = <0x6 0x6>;
+                                               };
+
+                                               macaddr_ART_18: macaddr@18 {
+                                                       reg = <0x18 0x6>;
+                                               };
+
+                                               macaddr_ART_1e: macaddr@1e {
+                                                       reg = <0x1e 0x6>;
+                                               };
+
+                                               precal_ART_1000: precal@1000 {
+                                                       reg = <0x1000 0x2f20>;
+                                               };
+
+                                               precal_ART_5000: precal@5000 {
+                                                       reg = <0x5000 0x2f20>;
+                                               };
                                        };
                                };
 

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-nighthawk.dtsi b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-nighthawk.dtsi
index 51ad5ac8eefcbd7931a6f969a0b23e8425ff2d18..4662e2843cb00e8c73c69eaa9af4bb1497f12636 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-nighthawk.dtsi
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-nighthawk.dtsi
@@ -261,24 +261,33 @@
                                label = "art";
                                reg = <0x1200000 0x0140000>;
                                read-only;
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
 
-                               macaddr_art_0: macaddr@0 {
-                                       reg = <0x0 0x6>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               macaddr_art_6: macaddr@6 {
-                                       reg = <0x6 0x6>;
-                               };
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
 
-                               precal_art_1000: precal@1000 {
-                                       reg = <0x1000 0x2f20>;
-                               };
+                                       macaddr_art_6: macaddr@6 {
+                                               compatible = "mac-base";
+                                               reg = <0x6 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+
+                                       macaddr_art_c: macaddr@c {
+                                               reg = <0xc 0x6>;
+                                       };
+
+                                       precal_art_1000: precal@1000 {
+                                               reg = <0x1000 0x2f20>;
+                                       };
 
-                               precal_art_5000: precal@5000 {
-                                       reg = <0x5000 0x2f20>;
+                                       precal_art_5000: precal@5000 {
+                                               reg = <0x5000 0x2f20>;
+                                       };
                                };
                        };
 

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-r7800.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
index bf7c963944b72d0b37f44a76199d0fa5f3dd84c5..3440c52699e50efc183a09d350f044db752b8a14 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
@@ -36,13 +36,11 @@
 };
 
 &wifi0 {
-       nvmem-cells = <&macaddr_art_6>, <&precal_art_1000>;
+       nvmem-cells = <&macaddr_art_6 1>, <&precal_art_1000>;
        nvmem-cell-names = "mac-address", "pre-calibration";
-       mac-address-increment = <(1)>;
 };
 
 &wifi1 {
-       nvmem-cells = <&macaddr_art_6>, <&precal_art_5000>;
+       nvmem-cells = <&macaddr_art_6 2>, <&precal_art_5000>;
        nvmem-cell-names = "mac-address", "pre-calibration";
-       mac-address-increment = <(2)>;
 };

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-rt4230w-rev6.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-rt4230w-rev6.dts
index 5453f9fcb3cbbccdcbe312aaec602c9bea85afcb..3f5e80759190e4d565351b62c9bd22ad56c39165 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-rt4230w-rev6.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-rt4230w-rev6.dts
@@ -209,24 +209,27 @@
                                label = "0:ART";
                                reg = <0x1200000 0x0140000>;
                                read-only;
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
 
-                               macaddr_ART_0: macaddr@0 {
-                                       reg = <0x0 0x6>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               macaddr_ART_6: macaddr@6 {
-                                       reg = <0x6 0x6>;
-                               };
+                                       macaddr_ART_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
 
-                               precal_ART_1000: precal@1000 {
-                                       reg = <0x1000 0x2f20>;
-                               };
+                                       macaddr_ART_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+
+                                       precal_ART_1000: precal@1000 {
+                                               reg = <0x1000 0x2f20>;
+                                       };
 
-                               precal_ART_5000: precal@5000 {
-                                       reg = <0x5000 0x2f20>;
+                                       precal_ART_5000: precal@5000 {
+                                               reg = <0x5000 0x2f20>;
+                                       };
                                };
                        };
 

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-tr4400-v2.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-tr4400-v2.dts
index 600bcc8421d96f2bf51f177e6606acb01e89f338..7679f28eef11c6e365bb1ef0635560e283066b60 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-tr4400-v2.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-tr4400-v2.dts
@@ -188,15 +188,17 @@
                                reg = <0x1200000 0x0140000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               precal_ART_1000: precal@1000 {
-                                       reg = <0x1000 0x2f20>;
-                               };
-                               precal_ART_5000: precal@5000 {
-                                       reg = <0x5000 0x2f20>;
+                               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>;
+                                       };
                                };
                        };
                        stock_partition@1340000 {
@@ -273,24 +275,26 @@
                                label = "fw_env";
                                reg = <0x6400000 0x0100000>;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_fw_env_0: macaddr@0 {
-                                       reg = <0x00 0x6>;
-                               };
-                               macaddr_fw_env_6: macaddr@6 {
-                                       reg = <0x06 0x6>;
-                               };
-                               macaddr_fw_env_c: macaddr@c {
-                                       reg = <0x0c 0x6>;
-                               };
-                               macaddr_fw_env_12: macaddr@12 {
-                                       reg = <0x12 0x6>;
-                               };
-                               macaddr_fw_env_18: macaddr@18 {
-                                       reg = <0x18 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_fw_env_0: macaddr@0 {
+                                               reg = <0x00 0x6>;
+                                       };
+                                       macaddr_fw_env_6: macaddr@6 {
+                                               reg = <0x06 0x6>;
+                                       };
+                                       macaddr_fw_env_c: macaddr@c {
+                                               reg = <0x0c 0x6>;
+                                       };
+                                       macaddr_fw_env_12: macaddr@12 {
+                                               reg = <0x12 0x6>;
+                                       };
+                                       macaddr_fw_env_18: macaddr@18 {
+                                               reg = <0x18 0x6>;
+                                       };
                                };
                        };
                        partition@6500000 {

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-xr450.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-xr450.dts
index 4353aec7ac090652459dde2edc906fa4f2984207..1d4e9d36fe42321cd582500178501ca42ffbf227 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-xr450.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-xr450.dts
@@ -42,9 +42,3 @@
        nvmem-cells = <&macaddr_art_0>, <&precal_art_5000>;
        nvmem-cell-names = "mac-address", "pre-calibration";
 };
-
-&art {
-       macaddr_art_c: macaddr@c {
-               reg = <0xc 0x6>;
-       };
-};

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-xr500.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-xr500.dts
index f584735e155e9fe43824941cd59073de8aaee8f3..9eef59eaf3dd2d2795600148184a9f139eb5fcbf 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-xr500.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-xr500.dts
@@ -42,9 +42,3 @@
        nvmem-cells = <&macaddr_art_0>, <&precal_art_5000>;
        nvmem-cell-names = "mac-address", "pre-calibration";
 };
-
-&art {
-       macaddr_art_c: macaddr@c {
-               reg = <0xc 0x6>;
-       };
-};

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-mr42.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-mr42.dts
index cfbfafb1793a076c0aa592fd1f90676111623c6b..d9d284fcfaf91349a599360c35a0e5896b9b0efe 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-mr42.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-mr42.dts
@@ -58,7 +58,7 @@
        phy-mode = "sgmii";
        phy-handle = <&phy2>;
 
-       nvmem-cells = <&mac_address>;
+       nvmem-cells = <&mac_address 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -84,11 +84,17 @@
                pagesize = <32>;
                reg = <0x56>;
                read-only;
-               #address-cells = <1>;
-               #size-cells = <1>;
 
-               mac_address: mac-address@66 {
-                       reg = <0x66 0x6>;
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       mac_address: mac-address@66 {
+                               compatible = "mac-base";
+                               reg = <0x66 0x6>;
+                               #nvmem-cell-cells = <1>;
+                       };
                };
        };
 };
@@ -186,21 +192,18 @@
 };
 
 &wifi0 {
-       nvmem-cells = <&mac_address>;
+       nvmem-cells = <&mac_address 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &wifi1 {
-       nvmem-cells = <&mac_address>;
+       nvmem-cells = <&mac_address 2>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <2>;
 };
 
 &wifi2 {
-       nvmem-cells = <&mac_address>;
+       nvmem-cells = <&mac_address 3>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <3>;
 };
 
 &hs_phy_0 {

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-mr52.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-mr52.dts
index f81e3ef690dcc33193dc381d166faedccf30bf62..522fa12fd977aa95c69fe9a720d8308384ddbe80 100644 (file)
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-mr52.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-mr52.dts
@@ -80,7 +80,7 @@
        phy-mode = "sgmii";
        phy-handle = <&phy0>;
 
-       nvmem-cells = <&mac_address>;
+       nvmem-cells = <&mac_address 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -93,9 +93,8 @@
        phy-mode = "sgmii";
        phy-handle = <&phy4>;
 
-       nvmem-cells = <&mac_address>;
+       nvmem-cells = <&mac_address 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &gsbi7 {
@@ -142,11 +141,17 @@
                pagesize = <32>;
                reg = <0x52>;
                read-only;
-               #address-cells = <1>;
-               #size-cells = <1>;
 
-               mac_address: mac-address@66 {
-                       reg = <0x66 0x6>;
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       mac_address: mac-address@66 {
+                               compatible = "mac-base";
+                               reg = <0x66 0x6>;
+                               #nvmem-cell-cells = <1>;
+                       };
                };
        };
 };
@@ -212,21 +217,18 @@
 };
 
 &wifi0 {
-       nvmem-cells = <&mac_address>;
+       nvmem-cells = <&mac_address 4>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <4>;
 };
 
 &wifi1 {
-       nvmem-cells = <&mac_address>;
+       nvmem-cells = <&mac_address 3>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <3>;
 };
 
 &wifi2 {
-       nvmem-cells = <&mac_address>;
+       nvmem-cells = <&mac_address 2>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <2>;
 };
 
 &hs_phy_0 {