From 3731fcbe55be68097fa3ca43937416bdcb8bef53 Mon Sep 17 00:00:00 2001 From: zhuo Date: Tue, 9 Jan 2024 15:03:36 -0800 Subject: [PATCH] ARM: dts: msm: Add cpas and cdm version parameter Add cpas and cdm version parameter for probe stage using in tvm. CRs-Fixed: 3684173 Change-Id: I1668b603f7dbfab628ff8322f438f8019a6e3197 Signed-off-by: zhuo --- bindings/msm-cam-cdm.txt | 12 ++++++++++++ bindings/msm-cam-cpas.txt | 18 ++++++++++++++++++ trustedvm-pineapple-camera.dtsi | 13 +++++++++++++ 3 files changed, 43 insertions(+) diff --git a/bindings/msm-cam-cdm.txt b/bindings/msm-cam-cdm.txt index 4ecef893..7d9d7df7 100644 --- a/bindings/msm-cam-cdm.txt +++ b/bindings/msm-cam-cdm.txt @@ -156,6 +156,16 @@ to CDM interface node. Definition: should specify vmrm resource id list order is mem label, mem tag, irq1 label, irq2 label. +- override-cdm-family + Usage: optional + Value type: + Definition: should specify cdm family. + +- override-cdm-version + Usage: optional + Value type: + Definition: should specify cdm version. + Example: qcom,cpas-cdm0@ac48000 { cell-index = <0>; @@ -187,5 +197,7 @@ Example: fifo-depths = <64 0 0 0>; single-context-cdm; vmrm-resource-ids = <12 12 12>; + override-cdm-family = <0>; + override-cdm-version = <0x20020000>; status = "ok"; }; diff --git a/bindings/msm-cam-cpas.txt b/bindings/msm-cam-cpas.txt index e3d889e9..fa5d7c0d 100644 --- a/bindings/msm-cam-cpas.txt +++ b/bindings/msm-cam-cpas.txt @@ -304,6 +304,21 @@ First Level Node - CAM CPAS device Definition: should specify vmrm resource id list order is mem label, mem tag, irq1 label, irq2 label. +- cam-version + Usage: optional + Value type: + Definition: should specify camera version. + +- cpas-version + Usage: optional + Value type: + Definition: should specify cpas version. + +- camera-capability + Usage: optional + Value type: + Definition: should specify camera capability. + =================================================================== Third Level Node - CAMNOC Level nodes =================================================================== @@ -528,6 +543,9 @@ Example: rt-wr-bw-ratio-scale-factor = <1>; enable-cam-drv; vmrm-resource-ids = <10 10 10>; + cam-version = <0x80800>; + cpas-version = <0x10000000>; + camera-capability = <0x9fffedeb 0x8>; camera-bus-nodes { level3-nodes { level-index = <3>; diff --git a/trustedvm-pineapple-camera.dtsi b/trustedvm-pineapple-camera.dtsi index 7efe2a8c..0818592c 100644 --- a/trustedvm-pineapple-camera.dtsi +++ b/trustedvm-pineapple-camera.dtsi @@ -1419,6 +1419,9 @@ rt-wr-lowstress-indicator-threshold = <0>; rt-wr-bw-ratio-scale-factor = <1>; vmrm-resource-ids = <10 10 10>; + cam-version = <0x80800>; + cpas-version = <0x10000000>; + camera-capability = <0x9fffedeb 0x8>; status = "ok"; camera-bus-nodes { @@ -2254,6 +2257,8 @@ cam-hw-mid = <0>; single-context-cdm; vmrm-resource-ids = <11 11 11>; + override-cdm-family = <0>; + override-cdm-version = <0x20020000>; status = "ok"; }; @@ -2275,6 +2280,8 @@ cam-hw-mid = <0>; single-context-cdm; vmrm-resource-ids = <12 12 12>; + override-cdm-family = <0>; + override-cdm-version = <0x20020000>; status = "ok"; }; @@ -2296,6 +2303,8 @@ cam-hw-mid = <0>; single-context-cdm; vmrm-resource-ids = <13 13 13>; + override-cdm-family = <0>; + override-cdm-version = <0x20020000>; status = "ok"; }; @@ -2317,6 +2326,8 @@ cam-hw-mid = <0>; single-context-cdm; vmrm-resource-ids = <14 14 14>; + override-cdm-family = <0>; + override-cdm-version = <0x20020000>; status = "ok"; }; @@ -2338,6 +2349,8 @@ cam-hw-mid = <0>; single-context-cdm; vmrm-resource-ids = <15 15 15>; + override-cdm-family = <0>; + override-cdm-version = <0x20020000>; status = "ok"; };