arm64: dts: sync up with new wcd codec bindings.

[karo-tx-linux.git] / arch / arm64 / boot / dts / qcom / msm8916.dtsi

diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 0cfa0ba54183787d08e75138f8969229b76aa6c1..e28c852a61640bb3b0a03a99212b77431ddc48bb 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -703,8 +703,8 @@
 
                /* Audio */
 
-               wcd_digital: codec-digital{
-                       compatible = "syscon", "qcom,apq8016-wcd-digital-codec";
+               lpass_codec_core: lpass-codec{
+                       compatible = "syscon", "qcom,msm8916-lpass-codec";
                        reg = <0x0771c000 0x400>;
                };
 
@@ -795,71 +795,12 @@
                        #thermal-sensor-cells = <1>;
                };
 
-               q6-smp2p {
-                       compatible = "qcom,smp2p";
-                       qcom,smem = <435>, <428>;
-                       interrupts = <0 27 1>;
-                       qcom,ipc = <&apcs 8 14>;
-
-                       qcom,local-pid = <0>;
-                       qcom,remote-pid = <1>;
-
-                       q6_smp2p_out: master-kernel {
-                               qcom,entry-name = "master-kernel";
-                               qcom,outbound;
-
-                               gpio-controller;
-                               #gpio-cells = <2>;
-                       };
-
-                       q6_smp2p_in: slave-kernel {
-                               qcom,entry-name = "slave-kernel";
-                               qcom,inbound;
-
-                               interrupt-controller;
-                               #interrupt-cells = <2>;
-                       };
-               };
-
-               wcnss-smp2p {
-                       compatible = "qcom,smp2p";
-                       qcom,smem = <451>, <431>;
-
-                       interrupts = <0 143 1>;
-
-                       qcom,ipc = <&apcs 8 18>;
-
-                       qcom,local-pid = <0>;
-                       qcom,remote-pid = <4>;
-
-                       wcnss_smp2p_out: master-kernel {
-                               qcom,entry-name = "master-kernel";
-                               qcom,outbound;
-
-                               gpio-controller;
-                               #gpio-cells = <2>;
-                       };
-
-                       wcnss_smp2p_in: slave-kernel {
-                               qcom,entry-name = "slave-kernel";
-                               qcom,inbound;
-
-                               interrupt-controller;
-                               #interrupt-cells = <2>;
-                       };
-               };
-
                hexagon@4080000 {
                        compatible = "qcom,pil-q6v56-mss", "qcom,q6v5-pil";
                        reg = <0x04080000 0x100>,
-                             <0x04020000 0x040>,
-                             <0x01810000 0x004>,
-                             <0x0194f000 0x010>,
-                             <0x01950000 0x008>,
-                             <0x01951000 0x008>;
+                             <0x04020000 0x040>;
 
-                       reg-names = "qdsp6_base", "rmb_base", "restart_reg_sec",
-                                       "halt_base", "halt_modem", "halt_nc";
+                       reg-names = "qdsp6", "rmb";
 
                        interrupts-extended = <&intc 0 24 1>,
                                              <&hexagon_smp2p_in 0 0>,
@@ -877,6 +818,11 @@
                        resets = <&scm 0>;
                        reset-names = "mss_restart";
 
+                       mx-supply = <&pm8916_l3>;
+                       pll-supply = <&pm8916_l7>;
+
+                       qcom,halt-regs = <&tcsr 0x18000 0x19000 0x1a000>;
+
                        mba {
                                memory-region = <&mba_mem>;
                        };
@@ -912,7 +858,7 @@
                        iris {
                                compatible = "qcom,wcn3620";
 
-                               clocks = <&rpmcc RPM_RF_CLK2>;
+                               clocks = <&rpmcc RPM_SMD_RF_CLK2>;
                                clock-names = "xo";
 
                                vddxo-supply = <&pm8916_l7>;
@@ -989,7 +935,7 @@
                                compatible = "qcom,rpm-msm8916";
                                qcom,smd-channels = "rpm_requests";
                                rpmcc: qcom,rpmcc {
-                                       compatible = "qcom,rpmcc-msm8916", "qcom,rpmcc";
+                                       compatible = "qcom,rpmcc-msm8916";
                                        #clock-cells = <1>;
                                };
 
@@ -1051,7 +997,7 @@
                                qcom,mmio = <&pronto>;
 
                                bt {
-                                       compatible = "qcom,btqcomsmd";
+                                       compatible = "qcom,wcnss-bt";
                                };
 
                                wifi {