ath79: ar: convert to mac-base

[openwrt/staging/jow.git] / target / linux / ath79 / dts / ar7161_aruba_ap-175.dts

diff --git a/target/linux/ath79/dts/ar7161_aruba_ap-175.dts b/target/linux/ath79/dts/ar7161_aruba_ap-175.dts
index dd29a687ba0e1d3c387cc2c7a5044115726be2ac..96a76a3cfc603b6bbbee2da2f763b541c5cf98a1 100644 (file)
--- a/target/linux/ath79/dts/ar7161_aruba_ap-175.dts
+++ b/target/linux/ath79/dts/ar7161_aruba_ap-175.dts
@@ -122,9 +122,8 @@
 
        ath9k0: wifi@0,11 {
                compatible = "pci168c,0029";
-               nvmem-cells = <&macaddr_hwinfo_1c>;
+               nvmem-cells = <&macaddr_hwinfo_1c 1>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
                reg = <0x8800 0 0 0 0>;
                #gpio-cells = <2>;
                gpio-controller;
@@ -132,9 +131,8 @@
 
        ath9k1: wifi@0,12 {
                compatible = "pci168c,0029";
-               nvmem-cells = <&macaddr_hwinfo_1c>;
+               nvmem-cells = <&macaddr_hwinfo_1c 2>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <2>;
                reg = <0x9000 0 0 0 0>;
                #gpio-cells = <2>;
                gpio-controller;
@@ -151,7 +149,7 @@
 
 &eth0 {
        status = "okay";
-       nvmem-cells = <&macaddr_hwinfo_1c>;
+       nvmem-cells = <&macaddr_hwinfo_1c 0>;
        nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii";
@@ -187,6 +185,18 @@
                                label = "hwinfo";
                                reg = <0xfe0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_hwinfo_1c: macaddr@1c {
+                                               compatible = "mac-base";
+                                               reg = <0x1c 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        partition@ff0000 {
@@ -198,16 +208,6 @@
        };
 };
 
-&hwinfo {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_hwinfo_1c: macaddr@1c {
-               reg = <0x1c 0x6>;
-       };
-};
-
 &i2c0 {
        gpio_ext: gpio@21 {
                status = "okay";