From 708ab9d3bc5b74eeee767c678366624d3c02a4ec Mon Sep 17 00:00:00 2001
From: Nickolay Goppen <setotau@mainlining.org>
Date: Wed, 29 Apr 2026 12:30:09 +0300
Subject: [PATCH] arm64: dts: qcom: sdm660: set cdsp compute-cbs' regs properly

Changing FastRPC compute-cbs' reg values to matching iommu streams
solves SMMU translation errors when trying to use FastRPC on CDSP
so change FastRPC compute-cbs' reg values that way

Fixes: c0c32a9e3493 ("arm64: dts: qcom: sdm630/660: Add CDSP-related nodes")
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Reviewed-by: Ekansh Gupta <ekansh.gupta@oss.qualcomm.com>
Signed-off-by: Nickolay Goppen <setotau@mainlining.org>
Link: https://lore.kernel.org/r/20260429-qcom-sdm660-cdsp-adsp-fastrpc-dts-fix-v5-2-16bc82e622ad@mainlining.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
---
 arch/arm64/boot/dts/qcom/sdm660.dtsi | 36 ++++++++++++++--------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sdm660.dtsi b/arch/arm64/boot/dts/qcom/sdm660.dtsi
index 3fd6dd82a992..0fca9662c64a 100644
--- a/arch/arm64/boot/dts/qcom/sdm660.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm660.dtsi
@@ -350,57 +350,57 @@ fastrpc {
 				#address-cells = <1>;
 				#size-cells = <0>;
 
+				compute-cb@3 {
+					compatible = "qcom,fastrpc-compute-cb";
+					reg = <3>;
+					iommus = <&cdsp_smmu 3>;
+				};
+
+				compute-cb@4 {
+					compatible = "qcom,fastrpc-compute-cb";
+					reg = <4>;
+					iommus = <&cdsp_smmu 4>;
+				};
+
 				compute-cb@5 {
 					compatible = "qcom,fastrpc-compute-cb";
 					reg = <5>;
-					iommus = <&cdsp_smmu 3>;
+					iommus = <&cdsp_smmu 5>;
 				};
 
 				compute-cb@6 {
 					compatible = "qcom,fastrpc-compute-cb";
 					reg = <6>;
-					iommus = <&cdsp_smmu 4>;
+					iommus = <&cdsp_smmu 6>;
 				};
 
 				compute-cb@7 {
 					compatible = "qcom,fastrpc-compute-cb";
 					reg = <7>;
-					iommus = <&cdsp_smmu 5>;
+					iommus = <&cdsp_smmu 7>;
 				};
 
 				compute-cb@8 {
 					compatible = "qcom,fastrpc-compute-cb";
 					reg = <8>;
-					iommus = <&cdsp_smmu 6>;
+					iommus = <&cdsp_smmu 8>;
 				};
 
 				compute-cb@9 {
 					compatible = "qcom,fastrpc-compute-cb";
 					reg = <9>;
-					iommus = <&cdsp_smmu 7>;
+					iommus = <&cdsp_smmu 9>;
 				};
 
 				compute-cb@10 {
 					compatible = "qcom,fastrpc-compute-cb";
 					reg = <10>;
-					iommus = <&cdsp_smmu 8>;
+					iommus = <&cdsp_smmu 10>;
 				};
 
 				compute-cb@11 {
 					compatible = "qcom,fastrpc-compute-cb";
 					reg = <11>;
-					iommus = <&cdsp_smmu 9>;
-				};
-
-				compute-cb@12 {
-					compatible = "qcom,fastrpc-compute-cb";
-					reg = <12>;
-					iommus = <&cdsp_smmu 10>;
-				};
-
-				compute-cb@13 {
-					compatible = "qcom,fastrpc-compute-cb";
-					reg = <13>;
 					iommus = <&cdsp_smmu 11>;
 				};
 			};