From e2ab33ccb7e4b85892393b0e4c487e7f0fe8fbeb Mon Sep 17 00:00:00 2001
From: Vandana Jain <c_vandja@qti.qualcomm.com>
Date: Thu, 27 May 2021 22:28:24 +0530
Subject: [PATCH] ARM: dts: msm: Add iommu cells count for msm8937 and sdm660

Added iommu cells count for msm8937 and sdm660.

Change-Id: I4feba409b8b0fb5b32ae0193089ac1dd95883ba4
---
 qcom/msm8937-camera.dtsi | 3 +++
 qcom/qm215-camera.dtsi   | 3 +++
 qcom/sdm660-camera.dtsi  | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/qcom/msm8937-camera.dtsi b/qcom/msm8937-camera.dtsi
index 16120ab7c082..98ed0d54c5fb 100644
--- a/qcom/msm8937-camera.dtsi
+++ b/qcom/msm8937-camera.dtsi
@@ -306,6 +306,7 @@
 			compatible = "qcom,msm-cam-smmu-cb";
 			iommus = <&apps_iommu 0x400 0x00>,
 				<&apps_iommu 0x2400 0x00>;
+			iommu-cells = <2>;
 			qcom,iommu-dma-addr-pool = <0x10000000 0x70000000>;
 			label = "vfe";
 			qcom,scratch-buf-support;
@@ -314,6 +315,7 @@
 		msm_cam_smmu_cb3: msm_cam_smmu_cb3 {
 			compatible = "qcom,msm-cam-smmu-cb";
 			iommus = <&apps_iommu 0x1c00 0x00>;
+			iommu-cells = <2>;
 			qcom,iommu-dma-addr-pool = <0x00020000 0x78000000>;
 			label = "cpp";
 		};
@@ -321,6 +323,7 @@
 		msm_cam_smmu_cb4: msm_cam_smmu_cb4 {
 			compatible = "qcom,msm-cam-smmu-cb";
 			iommus = <&apps_iommu 0x1800 0x00>;
+			iommu-cells = <2>;
 			qcom,iommu-dma-addr-pool = <0x00020000 0x78000000>;
 			label = "jpeg_enc0";
 		};
diff --git a/qcom/qm215-camera.dtsi b/qcom/qm215-camera.dtsi
index 9169b3b8ff3a..d41f786876d0 100644
--- a/qcom/qm215-camera.dtsi
+++ b/qcom/qm215-camera.dtsi
@@ -304,6 +304,7 @@
 			compatible = "qcom,msm-cam-smmu-cb";
 			iommus = <&apps_iommu 0x400 0x00>,
 				<&apps_iommu 0x2400 0x00>;
+			iommu-cells = <2>;
 			qcom,iommu-dma-addr-pool = <0x10000000 0x70000000>;
 			label = "vfe";
 			qcom,scratch-buf-support;
@@ -312,6 +313,7 @@
 		msm_cam_smmu_cb3: msm_cam_smmu_cb3 {
 			compatible = "qcom,msm-cam-smmu-cb";
 			iommus = <&apps_iommu 0x1c00 0x00>;
+			iommu-cells = <2>;
 			qcom,iommu-dma-addr-pool = <0x00020000 0x78000000>;
 			label = "cpp";
 		};
@@ -319,6 +321,7 @@
 		msm_cam_smmu_cb4: msm_cam_smmu_cb4 {
 			compatible = "qcom,msm-cam-smmu-cb";
 			iommus = <&apps_iommu 0x1800 0x00>;
+			iommu-cells = <2>;
 			qcom,iommu-dma-addr-pool = <0x00020000 0x78000000>;
 			label = "jpeg_enc0";
 		};
diff --git a/qcom/sdm660-camera.dtsi b/qcom/sdm660-camera.dtsi
index bd3827a97ce5..420102e15811 100644
--- a/qcom/sdm660-camera.dtsi
+++ b/qcom/sdm660-camera.dtsi
@@ -298,6 +298,7 @@
 					<&mmss_bimc_smmu 0xc01>,
 					<&mmss_bimc_smmu 0xc02>,
 					<&mmss_bimc_smmu 0xc03>;
+			iommu-cells = <1>;
 			label = "vfe";
 			qcom,scratch-buf-support;
 		};
@@ -305,18 +306,21 @@
 		msm_cam_smmu_cb2 {
 			compatible = "qcom,msm-cam-smmu-cb";
 			iommus = <&mmss_bimc_smmu 0xa00>;
+			iommu-cells = <1>;
 			label = "cpp";
 		};
 
 		msm_cam_smmu_cb4 {
 			compatible = "qcom,msm-cam-smmu-cb";
 			iommus = <&mmss_bimc_smmu 0x800>;
+			iommu-cells = <1>;
 			label = "jpeg_enc0";
 		};
 
 		msm_cam_smmu_cb5 {
 			compatible = "qcom,msm-cam-smmu-cb";
 			iommus = <&mmss_bimc_smmu 0x801>;
+			iommu-cells = <1>;
 			label = "jpeg_dma";
 		};
 	};