ath79: convert ath10k calibration data to NVMEM (binary MAC)

[openwrt/staging/svanheule.git] / target / linux / ath79 / dts / qca9558_devolo_dvl1xxx.dtsi

diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
index 0ec955bd110a022ea4656ce8462d071665eb4f32..9fea2589701460079b56c49e3f1b8fb46251dfff 100644 (file)
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
@@ -38,17 +38,18 @@
 
 &pcie0 {
        status = "okay";
-};
 
-&uart {
-       status = "okay";
+       wifi@0,0 {
+               compatible = "qcom,ath10k";
+               reg = <0x0000 0 0 0 0>;
+               nvmem-cells = <&cal_art_5000>, <&macaddr_art_0 (-1)>;
+               nvmem-cell-names = "calibration", "mac-address";
+       };
 };
 
 &spi {
        status = "okay";
 
-       num-cs = <1>;
-
        flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
@@ -75,6 +76,22 @@
                                label = "art";
                                reg = <0x050000 0x010000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               compatible = "mac-base";
+                                               reg = <0x0 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+
+                                       cal_art_5000: calibration@5000 {
+                                               reg = <0x5000 0x844>;
+                                       };
+                               };
                        };
 
                        partition@60000 {
@@ -105,43 +122,21 @@
 &eth0 {
        status = "okay";
 
-       mtd-mac-address = <&art 0x00>;
+       nvmem-cells = <&macaddr_art_0 0>;
+       nvmem-cell-names = "mac-address";
        phy-handle = <&phy4>;
-       phy-mode = "rgmii-rxid";
-       pll-data = <0xae000000 0x80000101 0x80001313>;
 
        gmac_config: gmac-config {
                device = <&gmac>;
 
-               rxdv-delay = <3>;
-               rxd-delay = <3>;
-               txen-delay = <0>;
-               txd-delay = <0>;
                rgmii-enabled = <1>;
        };
 };
 
-&mdio1 {
-       phy1: ethernet-phy@1 {
-               reg = <1>;
-               at803x-override-sgmii-link-check;
-       };
-};
-
-&eth1 {
-       mtd-mac-address = <&art 0x00>;
-       mtd-mac-address-increment = <1>;
-
-       phy-handle = <&phy1>;
-       pll-data = <0x03000101 0x00000101 0x00001313>;
-
-       qca955x-sgmii-fixup;
-};
-
 &wmac {
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x00>;
-       mtd-mac-address-increment = <(-2)>;
+       nvmem-cells = <&macaddr_art_0 (-2)>;
+       nvmem-cell-names = "mac-address";
 };