ath79: qca: convert to nvmem-layout

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

diff --git a/target/linux/ath79/dts/qca9558_netgear_ex7300.dts b/target/linux/ath79/dts/qca9558_netgear_ex7300.dts
index fc0b6de96cef6c8535ef33b07c36473a1e167ac1..81898e972f095fa150e66b514030bf734fa1d2f9 100644 (file)
--- a/target/linux/ath79/dts/qca9558_netgear_ex7300.dts
+++ b/target/linux/ath79/dts/qca9558_netgear_ex7300.dts
@@ -121,6 +121,14 @@
 
 &pcie0 {
        status = "okay";
+
+       wifi@0,0 {
+               compatible = "qcom,ath10k";
+               reg = <0 0 0 0 0>;
+
+               nvmem-cells = <&macaddr_caldata_c>, <&precal_caldata_5000>;
+               nvmem-cell-names = "mac-address", "pre-calibration";
+       };
 };
 
 &spi {
@@ -151,6 +159,32 @@
                                label = "caldata";
                                reg = <0x050000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_caldata_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_caldata_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
+
+                                       macaddr_caldata_c: macaddr@c {
+                                               reg = <0xc 0x6>;
+                                       };
+
+                                       cal_caldata_1000: cal@1000 {
+                                               reg = <0x1000 0x440>;
+                                       };
+
+                                       precal_caldata_5000: precal@5000 {
+                                               reg = <0x5000 0x2f20>;
+                                       };
+                               };
                        };
 
                        partition@60000 {
@@ -186,9 +220,8 @@
 &wmac {
        status = "okay";
 
-       mtd-cal-data = <&caldata 0x1000>;
-       nvmem-cells = <&macaddr_caldata_6>;
-       nvmem-cell-names = "mac-address";
+       nvmem-cells = <&macaddr_caldata_6>, <&cal_caldata_1000>;
+       nvmem-cell-names = "mac-address", "calibration";
 };
 
 &mdio0 {
@@ -211,17 +244,3 @@
 
        pll-data = <0x86000000 0x80000101 0x80001313>;
 };
-
-&caldata {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_caldata_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_caldata_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};