ipq40xx: remove mac-address-increment

[openwrt/openwrt.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 a9d7b51b3d18428a9f74f1a283dcfd1833ded0ef..1b1a697f13b029a08c161afb20317e85e3a0dd8f 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
@@ -238,7 +238,7 @@
 &gmac {
        status = "okay";
        nvmem-cell-names = "mac-address";
-       nvmem-cells = <&macaddr_config_0>;
+       nvmem-cells = <&macaddr_config_0 0>;
 };
 
 &switch {
@@ -251,8 +251,7 @@
        label = "wan";
 
        nvmem-cell-names = "mac-address";
-       nvmem-cells = <&macaddr_config_0>;
-       mac-address-increment = <1>;
+       nvmem-cells = <&macaddr_config_0 1>;
 };
 
 &swport3 {
@@ -309,7 +308,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_config_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -457,8 +458,7 @@
 &wifi0 {
        status = "okay";
        nvmem-cell-names = "pre-calibration", "mac-address";
-       nvmem-cells = <&precal_art_1000>, <&macaddr_config_0>;
-       mac-address-increment = <2>;
+       nvmem-cells = <&precal_art_1000>, <&macaddr_config_0 2>;
        qcom,ath10k-calibration-variant = "ZTE-MF18A";
 };
 
@@ -478,8 +478,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>;
                };