ipq40xx: remove mac-address-increment

[openwrt/staging/hauke.git] / target / linux / ipq40xx / files / arch / arm / boot / dts / qcom-ipq4019-mf289f.dts

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf289f.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf289f.dts
index 2e66f98f65450eb945198742c4615285919d8922..bbb2cb902a2e5c4b3020ec10f55ce2a0d88e9ce4 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf289f.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf289f.dts
@@ -243,7 +243,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_mac_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -316,7 +318,7 @@
 &gmac {
        status = "okay";
        nvmem-cell-names = "mac-address";
-       nvmem-cells = <&macaddr_mac_0>;
+       nvmem-cells = <&macaddr_mac_0 0>;
 };
 
 &switch {
@@ -329,8 +331,7 @@
        label = "wan";
 
        nvmem-cell-names = "mac-address";
-       nvmem-cells = <&macaddr_mac_0>;
-       mac-address-increment = <1>;
+       nvmem-cells = <&macaddr_mac_0 1>;
 };
 
 &swport5 {
@@ -407,8 +408,7 @@
 &wifi0 {
        status = "okay";
        nvmem-cell-names = "pre-calibration", "mac-address";
-       nvmem-cells = <&precal_art_1000>, <&macaddr_mac_0>;
-       mac-address-increment = <2>;
+       nvmem-cells = <&precal_art_1000>, <&macaddr_mac_0 2>;
        qcom,ath10k-calibration-variant = "zte,mf289f";
 };
 
@@ -416,8 +416,7 @@
 &wifi1 {
        status = "okay";
        nvmem-cell-names = "pre-calibration", "mac-address";
-       nvmem-cells = <&precal_art_5000>, <&macaddr_mac_0>;
-       mac-address-increment = <3>;
+       nvmem-cells = <&precal_art_5000>, <&macaddr_mac_0 3>;
        qcom,ath10k-calibration-variant = "zte,mf289f";
 };
 
@@ -436,8 +435,7 @@
 
                wifi2: wifi@1,0 {
                        nvmem-cell-names = "mac-address";
-                       nvmem-cells = <&macaddr_mac_0>;
-                       mac-address-increment = <4>;
+                       nvmem-cells = <&macaddr_mac_0 4>;
                        compatible = "qcom,ath10k";
                        reg = <0x00010000 0 0 0 0>;
                        qcom,ath10k-calibration-variant = "zte,mf289f";