ipq806x: remove mac-address-increment

[openwrt/staging/jow.git] / target / linux / ipq806x / files / arch / arm / boot / dts / qcom-ipq8062-wg2600hp3.dts

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";
 };