ipq806x: remove mac-address-increment

[openwrt/openwrt.git] / target / linux / ipq806x / files / arch / arm / boot / dts / qcom-ipq8064-ad7200-c2600.dtsi

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