ath79: ar: convert to mac-base

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

diff --git a/target/linux/ath79/dts/ar7161_meraki_mr16.dts b/target/linux/ath79/dts/ar7161_meraki_mr16.dts
index eb27e16e563f665a8ab7f7165f18422bd0234b77..6b8574e880f92960e9acdc0cfd1041573c4de735 100644 (file)
--- a/target/linux/ath79/dts/ar7161_meraki_mr16.dts
+++ b/target/linux/ath79/dts/ar7161_meraki_mr16.dts
@@ -16,13 +16,6 @@
                led-upgrade = &led_power_orange;
        };
 
-       extosc: ref {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-output-names = "ref";
-               clock-frequency = <40000000>;
-       };
-
        leds {
                compatible = "gpio-leds";
 
@@ -81,9 +74,8 @@
                compatible = "pci168c,0029";
                reg = <0x8800 0 0 0 0>;
                qca,no-eeprom;
-               nvmem-cells = <&macaddr_config_66>;
+               nvmem-cells = <&macaddr_config_66 1>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
                #gpio-cells = <2>;
                gpio-controller;
        };
@@ -92,18 +84,13 @@
                compatible = "pci168c,0029";
                reg = <0x9000 0 0 0 0>;
                qca,no-eeprom;
-               nvmem-cells = <&macaddr_config_66>;
+               nvmem-cells = <&macaddr_config_66 2>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <2>;
                #gpio-cells = <2>;
                gpio-controller;
        };
 };
 
-&pll {
-       clocks = <&extosc>;
-};
-
 &mdio0 {
        status = "okay";
 
@@ -114,7 +101,7 @@
 
 &eth0 {
        status = "okay";
-       nvmem-cells = <&macaddr_config_66>;
+       nvmem-cells = <&macaddr_config_66 0>;
        nvmem-cell-names = "mac-address";
 
        pll-data = <0x00110000 0x00001099 0x00991099>;
@@ -152,6 +139,18 @@
                                label = "config";
                                reg = <0x80000 0x20000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_config_66: macaddr@66 {
+                                               compatible = "mac-base";
+                                               reg = <0x66 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        partition@a0000 {
@@ -168,13 +167,3 @@
                };
        };
 };
-
-&config {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_config_66: macaddr@66 {
-               reg = <0x66 0x6>;
-       };
-};