arm64: dts: qcom: qcm2290: fix (some) of QUP interconnects

While adding interconnect support for the QCM2290 platform some of them
got the c&p error, rogue MASTER_APPSS_PROC for the config_noc
interconnect. Turn that into SLAVE_QUP_0 as expected.

Fixes: 5b970ff0193d ("arm64: dts: qcom: qcm2290: Hook up interconnects")
Reported-by: Konrad Dybcio <konradybcio@kernel.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20250207-rb1-bt-v4-4-d810fc8c94a9@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/qcm2290.dtsi b/arch/arm64/boot/dts/qcom/qcm2290.dtsi
index 6a7ce2c6b88e51e126cb5add007a0857b0606a0e..c7946731438bae2882e6710c21504915eff30dfa 100644 (file)
--- a/arch/arm64/boot/dts/qcom/qcm2290.dtsi
+++ b/arch/arm64/boot/dts/qcom/qcm2290.dtsi
@@ -1081,7 +1081,7 @@ spi0: spi@4a80000 {
                                interconnects = <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG
                                                 &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>,
                                                <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG
-                                                &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>;
+                                                &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>;
                                interconnect-names = "qup-core",
                                                     "qup-config";
                                #address-cells = <1>;
@@ -1100,7 +1100,7 @@ uart0: serial@4a80000 {
                                interconnects = <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG
                                                 &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>,
                                                <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG
-                                                &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>;
+                                                &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>;
                                interconnect-names = "qup-core",
                                                     "qup-config";
                                status = "disabled";
@@ -1145,7 +1145,7 @@ spi1: spi@4a84000 {
                                interconnects = <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG
                                                 &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>,
                                                <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG
-                                                &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>;
+                                                &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>;
                                interconnect-names = "qup-core",
                                                     "qup-config";
                                #address-cells = <1>;
@@ -1192,7 +1192,7 @@ spi2: spi@4a88000 {
                                interconnects = <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG
                                                 &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>,
                                                <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG
-                                                &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>;
+                                                &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>;
                                interconnect-names = "qup-core",
                                                     "qup-config";
                                #address-cells = <1>;
@@ -1239,7 +1239,7 @@ spi3: spi@4a8c000 {
                                interconnects = <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG
                                                 &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>,
                                                <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG
-                                                &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>;
+                                                &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>;
                                interconnect-names = "qup-core",
                                                     "qup-config";
                                #address-cells = <1>;
@@ -1303,7 +1303,7 @@ spi4: spi@4a90000 {
                                interconnects = <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG
                                                 &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>,
                                                <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG
-                                                &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>;
+                                                &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>;
                                interconnect-names = "qup-core",
                                                     "qup-config";
                                #address-cells = <1>;
@@ -1322,7 +1322,7 @@ uart4: serial@4a90000 {
                                interconnects = <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG
                                                 &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>,
                                                <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG
-                                                &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>;
+                                                &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>;
                                interconnect-names = "qup-core",
                                                     "qup-config";
                                status = "disabled";
@@ -1367,7 +1367,7 @@ spi5: spi@4a94000 {
                                interconnects = <&qup_virt MASTER_QUP_CORE_0 RPM_ALWAYS_TAG
                                                 &qup_virt SLAVE_QUP_CORE_0 RPM_ALWAYS_TAG>,
                                                <&bimc MASTER_APPSS_PROC RPM_ALWAYS_TAG
-                                                &config_noc MASTER_APPSS_PROC RPM_ALWAYS_TAG>;
+                                                &config_noc SLAVE_QUP_0 RPM_ALWAYS_TAG>;
                                interconnect-names = "qup-core",
                                                     "qup-config";
                                #address-cells = <1>;