ARM: dts: qcom: sdx55: fix IPA interconnect definitions

BugLink: https://bugs.launchpad.net/bugs/1959376
[ Upstream commit c0d6316c238b1bd743108bd4b08eda364f47c7c9 ]

The first two interconnects defined for IPA on the SDX55 SoC are
really two parts of what should be represented as a single path
between IPA and system memory.

Fix this by combining the "memory-a" and "memory-b" interconnects
into a single "memory" interconnect.

Reported-by: David Heidelberg <david@ixit.cz>
Tested-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/arch/arm/boot/dts/qcom-sdx55.dtsi b/arch/arm/boot/dts/qcom-sdx55.dtsi
index 1e6ce035f76a918b45a8f5149e1334042b5e6730..b5b784c5c65e4d68628a4e0f95c16e5db962d463 100644 (file)
--- a/arch/arm/boot/dts/qcom-sdx55.dtsi
+++ b/arch/arm/boot/dts/qcom-sdx55.dtsi
@@ -334,12 +334,10 @@
                        clocks = <&rpmhcc RPMH_IPA_CLK>;
                        clock-names = "core";
 
-                       interconnects = <&system_noc MASTER_IPA &system_noc SLAVE_SNOC_MEM_NOC_GC>,
-                                       <&mem_noc MASTER_SNOC_GC_MEM_NOC &mc_virt SLAVE_EBI_CH0>,
+                       interconnects = <&system_noc MASTER_IPA &mc_virt SLAVE_EBI_CH0>,
                                        <&system_noc MASTER_IPA &system_noc SLAVE_OCIMEM>,
                                        <&mem_noc MASTER_AMPSS_M0 &system_noc SLAVE_IPA_CFG>;
-                       interconnect-names = "memory-a",
-                                            "memory-b",
+                       interconnect-names = "memory",
                                             "imem",
                                             "config";