Revert "arm64: dts: sdm845: add IPA information"

This reverts commit 9cc5ae125f0eaee471bc87fb5cbf29385fd9272a.

This commit:
  b303f9f0050b arm64: dts: sdm845: Redefine interconnect provider DT nodes
found in the Qualcomm for-next tree removes/redefines the interconnect
provider node(s) used for IPA.  I'm not sure whether it technically
conflicts with the IPA change to "sdm845.dtsi" in for-next, but it renders
it broken.

Revert this commit in the for-next tree, with the plan to incorporate
it into the Qualcomm tree instead.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index 58fd1c6118493b9d0110b26acd4a61f648d96dcf..d42302b8889b6b18db2903d3a6c5cb8bd8b1ac85 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -675,17 +675,6 @@
                        interrupt-controller;
                        #interrupt-cells = <2>;
                };
-
-               ipa_smp2p_out: ipa-ap-to-modem {
-                       qcom,entry-name = "ipa";
-                       #qcom,smem-state-cells = <1>;
-               };
-
-               ipa_smp2p_in: ipa-modem-to-ap {
-                       qcom,entry-name = "ipa";
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-               };
        };
 
        smp2p-slpi {
@@ -1446,46 +1435,6 @@
                        };
                };
 
-               ipa@1e40000 {
-                       compatible = "qcom,sdm845-ipa";
-
-                       modem-init;
-                       modem-remoteproc = <&mss_pil>;
-
-                       reg = <0 0x1e40000 0 0x7000>,
-                             <0 0x1e47000 0 0x2000>,
-                             <0 0x1e04000 0 0x2c000>;
-                       reg-names = "ipa-reg",
-                                   "ipa-shared",
-                                   "gsi";
-
-                       interrupts-extended =
-                                       <&intc 0 311 IRQ_TYPE_EDGE_RISING>,
-                                       <&intc 0 432 IRQ_TYPE_LEVEL_HIGH>,
-                                       <&ipa_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
-                                       <&ipa_smp2p_in 1 IRQ_TYPE_EDGE_RISING>;
-                       interrupt-names = "ipa",
-                                         "gsi",
-                                         "ipa-clock-query",
-                                         "ipa-setup-ready";
-
-                       clocks = <&rpmhcc RPMH_IPA_CLK>;
-                       clock-names = "core";
-
-                       interconnects =
-                               <&rsc_hlos MASTER_IPA &rsc_hlos SLAVE_EBI1>,
-                               <&rsc_hlos MASTER_IPA &rsc_hlos SLAVE_IMEM>,
-                               <&rsc_hlos MASTER_APPSS_PROC &rsc_hlos SLAVE_IPA_CFG>;
-                       interconnect-names = "memory",
-                                            "imem",
-                                            "config";
-
-                       qcom,smem-states = <&ipa_smp2p_out 0>,
-                                          <&ipa_smp2p_out 1>;
-                       qcom,smem-state-names = "ipa-clock-enabled-valid",
-                                               "ipa-clock-enabled";
-               };
-
                tcsr_mutex_regs: syscon@1f40000 {
                        compatible = "syscon";
                        reg = <0 0x01f40000 0 0x40000>;