ath79: ar: convert to nvmem-layout

[openwrt/staging/hauke.git] / target / linux / ath79 / dts / ar9344_netgear_wndr.dtsi

diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
index c075c38557e959eefd4976148c06c539f0d644b1..d2a30000044e63d0af0b2213672ab4c74107ad3a 100644 (file)
--- a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
+++ b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
@@ -127,6 +127,28 @@
                        label = "caldata";
                        reg = <0x80000 0x40000>;
                        read-only;
+
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               macaddr_caldata_0: macaddr@0 {
+                                       reg = <0x0 0x6>;
+                               };
+
+                               macaddr_caldata_c: macaddr@c {
+                                       reg = <0xc 0x6>;
+                               };
+
+                               cal_art_1000: cal@1000 {
+                                       reg = <0x1000 0x440>;
+                               };
+
+                               cal_art_5000: cal@5000 {
+                                       reg = <0x5000 0x440>;
+                               };
+                       };
                };
 
                partition@c0000 {
@@ -192,8 +214,6 @@
 &mdio0 {
        status = "okay";
 
-       phy-mask = <0>;
-
        phy0: ethernet-phy@0 {
                reg = <0>;
                phy-mode = "rgmii";
@@ -245,9 +265,8 @@
 &wmac {
        status = "okay";
 
-       nvmem-cells = <&macaddr_caldata_0>;
-       nvmem-cell-names = "mac-address";
-       qca,no-eeprom;
+       nvmem-cells = <&macaddr_caldata_0>, <&cal_art_1000>;
+       nvmem-cell-names = "mac-address", "calibration";
 };
 
 &pcie {
@@ -256,24 +275,9 @@
        ath9k: wifi@0,0 {
                compatible = "pci168c,0033";
                reg = <0x0000 0 0 0 0>;
-               nvmem-cells = <&macaddr_caldata_c>;
-               nvmem-cell-names = "mac-address";
-               qca,no-eeprom;
+               nvmem-cells = <&macaddr_caldata_c>, <&cal_art_5000>;
+               nvmem-cell-names = "mac-address", "calibration";
                #gpio-cells = <2>;
                gpio-controller;
        };
 };
-
-&caldata {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_caldata_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_caldata_c: macaddr@c {
-               reg = <0xc 0x6>;
-       };
-};