ath79: qca: remove mac-address-increment

[openwrt/staging/hauke.git] / target / linux / ath79 / dts / qca9558_tplink_tl-wdr4900-v2.dts

diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts b/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts
index b052a830bc751b7d755da74834de465ef7ae1ceb..0edba24040e3599854d82661b79a8cff230baf88 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts
@@ -96,9 +96,8 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,0033";
                reg = <0x0000 0 0 0 0>;
-               nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_ath9k_pci>;
+               nvmem-cells = <&macaddr_uboot_1fc00 (-2)>, <&cal_ath9k_pci>;
                nvmem-cell-names = "mac-address", "calibration";
-               mac-address-increment = <(-2)>;
                #gpio-cells = <2>;
                gpio-controller;
        };
@@ -144,7 +143,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_uboot_1fc00: macaddr@1fc00 {
+                                               compatible = "mac-base";
                                                reg = <0x1fc00 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };
@@ -200,9 +201,8 @@
 &eth0 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
        phy-handle = <&phy0>;
        pll-data = <0x56000000 0x00000101 0x00001616>;
 
@@ -215,7 +215,7 @@
 &eth1 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_uboot_1fc00>;
+       nvmem-cells = <&macaddr_uboot_1fc00 0>;
        nvmem-cell-names = "mac-address";
        pll-data = <0x03000101 0x00000101 0x00001616>;
 
@@ -228,7 +228,6 @@
 &wmac {
        status = "okay";
 
-       nvmem-cells = <&macaddr_uboot_1fc00>, <&cal_ath9k_soc>;
+       nvmem-cells = <&macaddr_uboot_1fc00 (-1)>, <&cal_ath9k_soc>;
        nvmem-cell-names = "mac-address", "calibration";
-       mac-address-increment = <(-1)>;
 };