ath79: use "fixed-layout" for Embedded Wireless devices

[openwrt/staging/dangole.git] / target / linux / ath79 / dts / ar9344_embeddedwireless_balin.dts

diff --git a/target/linux/ath79/dts/ar9344_embeddedwireless_balin.dts b/target/linux/ath79/dts/ar9344_embeddedwireless_balin.dts
index a84c273f8622c50bc0a094dbf00af902e22e3469..de138658180760eb2fdd670a357a4b8a0fb484f7 100644 (file)
--- a/target/linux/ath79/dts/ar9344_embeddedwireless_balin.dts
+++ b/target/linux/ath79/dts/ar9344_embeddedwireless_balin.dts
@@ -83,16 +83,20 @@
                                reg = <0xff0000 0x010000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               calibration_art_1000: calibration_data@1000 {
-                                       reg = <0x1000 0x440>;
-                               };
-
-                               macaddr_art_1002: macaddr@1002 {
-                                       reg = <0x1002 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       calibration_art_1000: calibration_data@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
+                                       macaddr_art_1002: macaddr@1002 {
+                                               compatible = "mac-base";
+                                               reg = <0x1002 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
                                };
                        };
                };
@@ -106,10 +110,8 @@
 &eth1 {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_1002>;
+       nvmem-cells = <&macaddr_art_1002 0x400000>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment-byte = <3>;
-       mac-address-increment = <0x40>;
 
        gmac-config {
                device = <&gmac>;
@@ -121,7 +123,7 @@
 &wmac {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_1002>, <&calibration_art_1000>;
+       nvmem-cells = <&macaddr_art_1002 0>, <&calibration_art_1000>;
        nvmem-cell-names = "mac-address", "calibration";
 };