From 1c63ed6b0ac5c75db88708f9127911a1280e3035 Mon Sep 17 00:00:00 2001
From: chengxue <quic_chengxue@quicinc.com>
Date: Wed, 3 Jan 2024 12:33:13 -0800
Subject: [PATCH] ARM: dts: msm: Add properties for trustedvm camera heap sizes

Add device and session heap size properties on trustedvm
camera dtsi file.

CRs-Fixed: 3661586
Change-Id: Ie83e5dd1951760d6d402118c5c5cf40557a5b6c1
Signed-off-by: chengxue <quic_chengxue@quicinc.com>
---
 bindings/msm-camera.txt         | 33 ++++++++++++++++++++++++++++-----
 trustedvm-pineapple-camera.dtsi |  2 ++
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/bindings/msm-camera.txt b/bindings/msm-camera.txt
index cbbb136b..0ef6a6b7 100644
--- a/bindings/msm-camera.txt
+++ b/bindings/msm-camera.txt
@@ -3,14 +3,37 @@
 Required properties:
 - compatible :
     - "qcom,cam-req-mgr", "qcom,cam-sync"
-- qcom,sensor-manual-probe : specify if sensor probes at kernel boot time or user driven
+
+- cam-bypass-driver :
+  Usage: optional
+  Value type: <u32>
+  Definition: should contain drivers that required to bypass on camera,
+    including rgltr, rgltr_mode, clks, cesta, icc.
+
+- device-heap-size :
+  Usage: optional
+  Value type: <u32>
+  Definition: heap size used for camera internal allocations (exa - hfi memory) which stay forever.
+
+- session-heap-size :
+  Usage: optional
+  Value type: <u32>
+  Definition: heap size used for session based allocations. These allocations must be freed at the
+    end of session and the session-heap memory will be released to PVM at the end of usecase.
 
 Example:
 
-   qcom,cam-req-mgr {
-       compatible = "qcom,cam-req-mgr";
-       qcom,sensor-manual-probe;
-   };
+	qcom,cam-req-mgr {
+		compatible = "qcom,cam-req-mgr";
+		cam-bypass-driver = <(CAM_BYPASS_RGLTR |
+			CAM_BYPASS_RGLTR_MODE |
+			CAM_BYPASS_CLKS |
+			CAM_BYPASS_CESTA |
+			CAM_BYPASS_ICC)>;
+		device-heap-size = <0x400000>;
+		session-heap-size = <0xC800000>;
+		status = "ok";
+	};
 
    qcom,cam-sync {
        compatible = "qcom,cam-sync";
diff --git a/trustedvm-pineapple-camera.dtsi b/trustedvm-pineapple-camera.dtsi
index fd532198..ca15437e 100644
--- a/trustedvm-pineapple-camera.dtsi
+++ b/trustedvm-pineapple-camera.dtsi
@@ -862,6 +862,8 @@
 			CAM_BYPASS_CLKS |
 			CAM_BYPASS_CESTA |
 			CAM_BYPASS_ICC)>;
+		device-heap-size = <0x400000>;
+		session-heap-size = <0xC800000>;
 		status = "ok";
 	};