ipq40xx: convert to nvmem-layout

[openwrt/staging/jow.git] / target / linux / ipq40xx / files / arch / arm / boot / dts / qcom-ipq4019-gl-b2200.dts

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-gl-b2200.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-gl-b2200.dts
index 339a1e0f7247034d79878467ebbac14ed0854914..5cb5f7ca082fa38316f65befb6d9f14275b9fb84 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-gl-b2200.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-gl-b2200.dts
@@ -18,6 +18,10 @@
                bootargs-append = " root=/dev/mmcblk0p2 rw rootwait clk_ignore_unused";
        };
 
+       aliases {
+               ethernet1 = &swport4;
+       };
+
        soc {
                rng@22000 {
                        status = "okay";
@@ -27,10 +31,6 @@
                        status = "okay";
                };
 
-               ess-psgmii@98000 {
-                       status = "okay";
-               };
-
                tcsr@1949000 {
                        compatible = "qcom,tcsr";
                        reg = <0x1949000 0x100>;
@@ -60,16 +60,6 @@
                crypto@8e3a000 {
                        status = "okay";
                };
-
-               ess-switch@c000000 {
-                       status = "okay";
-                       switch_lan_bmp = <0x2e>;
-                       switch_wan_bmp = <0x10>;
-               };
-
-               edma@c080000 {
-                       status = "okay";
-               };
        };
 
        keys {
@@ -113,18 +103,6 @@
        };
 };
 
-&gmac1 {
-       qcom,phy_mdio_addr = <3>;
-       qcom,poll_required = <1>;
-       qcom,forced_speed = <1000>;
-       qcom,forced_duplex = <1>;
-       vlan_tag = <2 0x10>;
-};
-
-&gmac0 {
-       vlan_tag = <1 0x2e>;
-};
-
 &vqmmc {
        status = "okay";
 };
@@ -207,6 +185,24 @@
                                label = "ART";
                                reg = <0x170000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       precal_art_1000: precal@1000 {
+                                               reg = <0x1000 0x2f20>;
+                                       };
+
+                                       precal_art_5000: precal@5000 {
+                                               reg = <0x5000 0x2f20>;
+                                       };
+
+                                       precal_art_9000: precal@9000 {
+                                               reg = <0x9000 0x2f20>;
+                                       };
+                               };
                        };
                };
        };
@@ -218,7 +214,7 @@
        status = "okay";
 
        spidev1: spi@0 {
-               compatible = "siliconlabs,si3210";
+               compatible = "silabs,si3210";
                reg = <0>;
                spi-max-frequency = <24000000>;
        };
@@ -346,19 +342,48 @@
 
                wifi2: wifi@1,0 {
                        status = "okay";
+                       /* Bootlog shows this is a 168c:0056 - QCA 9888v2 */
                        compatible = "qcom,ath10k";
                        reg = <0x00010000 0 0 0 0>;
+                       nvmem-cell-names = "pre-calibration";
+                       nvmem-cells = <&precal_art_9000>;
                        qcom,ath10k-calibration-variant = "GL-B2200";
+                       ieee80211-freq-limit = <5450000 5900000>;
                };
        };
 };
 
+&gmac {
+       status = "okay";
+};
+
+&switch {
+       status = "okay";
+};
+
+&swport4 {
+       status = "okay";
+
+       label = "wan";
+};
+
+&swport5 {
+       status = "okay";
+
+       label = "lan";
+};
+
 &wifi0 {
        status = "okay";
+       nvmem-cell-names = "pre-calibration";
+       nvmem-cells = <&precal_art_1000>;
        qcom,ath10k-calibration-variant = "GL-B2200";
 };
 
 &wifi1 {
        status = "okay";
+       nvmem-cell-names = "pre-calibration";
+       nvmem-cells = <&precal_art_5000>;
        qcom,ath10k-calibration-variant = "GL-B2200";
+       ieee80211-freq-limit = <5100000 5400000>;
 };