From 6fd3749418b3b8888b308650330e295ca43008e3 Mon Sep 17 00:00:00 2001
From: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
Date: Tue, 7 Apr 2026 11:07:38 +0530
Subject: [PATCH 1/2] PENDING: arm64: dts: qcom: lemans: switch iris iommus to
 iommu-map

Switch the iris video codec node in sa8775p (lemans) from the legacy
'iommus' property to 'iommu-map', using IRIS_NON_PIXEL_VCODEC and
IRIS_PIXEL function IDs to identify the non-pixel and pixel context
bank SMMU stream mappings respectively.

Signed-off-by: Vishnu Reddy <busanna.reddy@oss.qualcomm.com>
Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
Signed-off-by: Gourav Kumar <gouravk@qti.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/lemans.dtsi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/lemans.dtsi b/arch/arm64/boot/dts/qcom/lemans.dtsi
index b3e96bf946f77..100f8a99141db 100644
--- a/arch/arm64/boot/dts/qcom/lemans.dtsi
+++ b/arch/arm64/boot/dts/qcom/lemans.dtsi
@@ -17,6 +17,7 @@
 #include <dt-bindings/interconnect/qcom,osm-l3.h>
 #include <dt-bindings/interconnect/qcom,sa8775p-rpmh.h>
 #include <dt-bindings/mailbox/qcom-ipcc.h>
+#include <dt-bindings/media/qcom,sm8550-iris.h>
 #include <dt-bindings/firmware/qcom,scm.h>
 #include <dt-bindings/power/qcom-rpmpd.h>
 #include <dt-bindings/soc/qcom,gpr.h>
@@ -4620,8 +4621,8 @@
 			resets = <&gcc GCC_VIDEO_AXI0_CLK_ARES>;
 			reset-names = "bus";
 
-			iommus = <&apps_smmu 0x0880 0x0400>,
-				 <&apps_smmu 0x0887 0x0400>;
+			iommu-map = <IRIS_NON_PIXEL_VCODEC &apps_smmu 0x0880 0x0400 0x1>,
+				 <IRIS_PIXEL &apps_smmu 0x0887 0x0400 0x1>;
 			dma-coherent;
 
 			status = "disabled";

From 008482ba3b7cdce2eb59558f52e5bce36fee7f3b Mon Sep 17 00:00:00 2001
From: Gourav Kumar <gouravk@qti.qualcomm.com>
Date: Fri, 10 Apr 2026 22:37:06 +0530
Subject: [PATCH 2/2] PENDING: arm64: dts: qcom: lemans-ride: Drop video
 firmware from common

As per memory map, video firmware memory region is 7MB for sa8775*
variants while it is 16MB for qcs9100* variants. Keeping the 7MB variant
of video firmware in ride common DTS does not allow qcs9100* to pick the
16MB variant. Drop it from common and define in respective variant DTS.

Signed-off-by: Gourav Kumar <gouravk@qti.qualcomm.com>
Signed-off-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
Signed-off-by: Venkata Siva Pavan KumarVenkatapatigari <venvenk@qti.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/lemans-auto.dtsi        | 4 ++++
 arch/arm64/boot/dts/qcom/lemans-ride-common.dtsi | 2 --
 arch/arm64/boot/dts/qcom/lemans.dtsi             | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/lemans-auto.dtsi b/arch/arm64/boot/dts/qcom/lemans-auto.dtsi
index 8db958d60fd1d..07fa9cb148ae6 100644
--- a/arch/arm64/boot/dts/qcom/lemans-auto.dtsi
+++ b/arch/arm64/boot/dts/qcom/lemans-auto.dtsi
@@ -102,3 +102,7 @@
 		};
 	};
 };
+
+&iris {
+	firmware-name = "qcom/vpu/vpu30_p4_s6.mbn";
+};
diff --git a/arch/arm64/boot/dts/qcom/lemans-ride-common.dtsi b/arch/arm64/boot/dts/qcom/lemans-ride-common.dtsi
index c72a01fdc75de..68f8d5b432ec5 100644
--- a/arch/arm64/boot/dts/qcom/lemans-ride-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/lemans-ride-common.dtsi
@@ -580,8 +580,6 @@
 };
 
 &iris {
-	firmware-name = "qcom/vpu/vpu30_p4_s6.mbn";
-
 	status = "okay";
 };
 
diff --git a/arch/arm64/boot/dts/qcom/lemans.dtsi b/arch/arm64/boot/dts/qcom/lemans.dtsi
index 100f8a99141db..9fe64a34f2127 100644
--- a/arch/arm64/boot/dts/qcom/lemans.dtsi
+++ b/arch/arm64/boot/dts/qcom/lemans.dtsi
@@ -4618,6 +4618,8 @@
 
 			memory-region = <&pil_video_mem>;
 
+			firmware-name = "qcom/vpu/vpu30_p4_s6_16mb.mbn";
+
 			resets = <&gcc GCC_VIDEO_AXI0_CLK_ARES>;
 			reset-names = "bus";