lantiq: remove mac-address-increment

[openwrt/openwrt.git] / target / linux / lantiq / files / arch / mips / boot / dts / lantiq / ar9_avm_fritz7320.dts

diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts
index cd7b29ca6d1d604ad1bdfdf633a3148c3d327cf9..b04efd8a846cc4b48010e8e84464c5dd00fe93cc 100644 (file)
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts
@@ -99,9 +99,8 @@
 &gsw {
        phy-mode = "mii";
        phy-handle = <&phy0>;
-       nvmem-cells = <&macaddr_ath9k_cal_a91>;
+       nvmem-cells = <&macaddr_ath9k_cal_a91 (-2)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-2)>;
 
        mdio-bus {
                #address-cells = <1>;
@@ -155,6 +154,18 @@
                                label = "urlader";
                                reg = <0x00000 0x20000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_ath9k_cal_a91: macaddr@a91 {
+                                               compatible = "mac-base";
+                                               reg = <0xa91 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        partition@20000 {
@@ -215,13 +226,3 @@
        status = "okay";
        vbus-supply = <&usb1_vbus>;
 };
-
-&ath9k_cal {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_ath9k_cal_a91: macaddr@a91 {
-               reg = <0xa91 0x6>;
-       };
-};