ath79: ar: convert to mac-base

[openwrt/staging/jow.git] / target / linux / ath79 / dts / ar9344_openmesh_mr600.dtsi

diff --git a/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi b/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi
index b7ec8199e9b814a71bab16e312a6d8af0c3078a7..7661789e2f6156f17bd5213fccdde422f8410a24 100644 (file)
--- a/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi
+++ b/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi
@@ -81,7 +81,9 @@
                                        #size-cells = <1>;
 
                                        macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
                                                reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
                                        };
 
                                        calibration_art_1000: calibration@1000 {
@@ -112,7 +114,7 @@
 
        pll-data = <0x02000000 0x00000101 0x00001313>;
 
-       nvmem-cells = <&macaddr_art_0>;
+       nvmem-cells = <&macaddr_art_0 0>;
        nvmem-cell-names = "mac-address";
 
        phy-mode = "rgmii-id";
@@ -129,9 +131,8 @@
 &wmac {
        status = "okay";
 
-       nvmem-cells = <&macaddr_art_0>, <&calibration_art_1000>;
+       nvmem-cells = <&macaddr_art_0 1>, <&calibration_art_1000>;
        nvmem-cell-names = "mac-address", "calibration";
-       mac-address-increment = <1>;
 };
 
 &pcie {
@@ -140,9 +141,8 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,0030";
                reg = <0x0000 0 0 0 0>;
-               nvmem-cells = <&macaddr_art_0>, <&calibration_art_5000>;
+               nvmem-cells = <&macaddr_art_0 8>, <&calibration_art_5000>;
                nvmem-cell-names = "mac-address", "calibration";
-               mac-address-increment = <8>;
 
                gpio-controller;
                #gpio-cells = <2>;