ARM64: dts: qcom: msm8916: Update wcnss nodes

The WCNSS remoteproc and hw blocks have updated bindings, so update the
dts.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 91d9ce00eea9179863468119ec4ce2438f3b3b38..0cfa0ba54183787d08e75138f8969229b76aa6c1 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -886,10 +886,10 @@
                        };
                };
 
-               wcnss@a21b000 {
-                       compatible = "qcom,pronto-v2-pil";
-                       reg = <0x0a21b000 0x3000>;
-                       reg-names = "pmu";
+               pronto: wcnss@a21b000 {
+                       compatible = "qcom,pronto-v2-pil", "qcom,pronto";
+                       reg = <0x0a204000 0x2000>, <0x0a202000 0x1000>, <0x0a21b000 0x3000>;
+                       reg-names = "ccu", "dxe", "pmu";
 
                        memory-region = <&wcnss_mem>;
 
@@ -1037,40 +1037,32 @@
                        };
                };
 
-               pronto_smd_edge: pronto {
+               pronto {
                        interrupts = <0 142 1>;
 
                        qcom,ipc = <&apcs 8 17>;
                        qcom,smd-edge = <6>;
                        qcom,remote-pid = <4>;
 
-                               bt {
-                               compatible = "qcom,hci-smd";
-                               qcom,smd-channels = "APPS_RIVA_BT_CMD", "APPS_RIVA_BT_ACL";
-                               qcom,smd-channel-names = "event", "data";
-                       };
-
-                       ipcrtr {
-                               compatible = "qcom,ipcrtr";
-                               qcom,smd-channels = "IPCRTR";
-                       };
+                       wcnss {
+                               compatible = "qcom,wcnss";
+                               qcom,smd-channels = "WCNSS_CTRL";
 
-                       wifi {
-                               compatible = "qcom,wcn3620-wlan";
-                               qcom,smd-channels = "WLAN_CTRL";
+                               qcom,mmio = <&pronto>;
 
-                               interrupts = <0 145 0>, <0 146 0>;
-                               interrupt-names = "wcnss_wlantx_irq", "wcnss_wlanrx_irq";
+                               bt {
+                                       compatible = "qcom,btqcomsmd";
+                               };
 
-                               qcom,wcnss-mmio = <0x0a000000 0x21b000>;
+                               wifi {
+                                       compatible = "qcom,wcnss-wlan";
 
-                               // qcom,tx-enable-gpios = <&apps_smsm 10 0>;
-                               // qcom,tx-rings-empty-gpios = <&apps_smsm 9 0>;
-                       };
+                                       interrupts = <0 145 0>, <0 146 0>;
+                                       interrupt-names = "tx", "rx";
 
-                       wcnss_ctrl {
-                               compatible = "qcom,wcnss";
-                               qcom,smd-channels = "WCNSS_CTRL";
+                                       qcom,state = <&apps_smsm 10>, <&apps_smsm 9>;
+                                       qcom,state-names = "tx-enable", "tx-rings-empty";
+                               };
                        };
                };
        };