From 127c72fa34174dbd3c2bb2324369a04f05373117 Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Fri, 17 May 2024 12:22:52 -0700 Subject: [PATCH 1/9] CAMX: Snap for drop 05/17/2024 mainline 1198 LA.VENDOR.15.4.0.AU334 Change-Id: If1dfdd9e03a19c5b52ebbe9f95a4ce3a94de0745 Signed-off-by: Haritha Chintalapati From e7560cdc867163ca37b95539ea3162e4b19124e7 Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Tue, 21 May 2024 12:25:50 -0700 Subject: [PATCH 2/9] CAMX: Snap for drop 05/20/2024 mainline 1199 LA.VENDOR.15.4.0.AU334 Change-Id: Ia414575eb7986294bff80440a6322fdfadf7bcc9 Signed-off-by: Haritha Chintalapati From 30755928b54028b6d176eb436c210229e7a4676b Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Tue, 21 May 2024 22:45:04 -0700 Subject: [PATCH 3/9] CAMX: Snap for drop 05/21/2024 mainline 1200 LA.VENDOR.15.4.0.AU345 Change-Id: I54fbe2b3333e0c442a083bec4fd2d877c23bd123 Signed-off-by: Haritha Chintalapati From 9b361f64a484051346cd053cdb46e447f028d76b Mon Sep 17 00:00:00 2001 From: Atiya Kailany Date: Wed, 22 May 2024 17:14:29 -0700 Subject: [PATCH 4/9] ARM: dts: msm: Add flag indicating crmb api support This flag is added in cpas node to indicate that the src clk in this node supports crmb api passthrough when voting. CRs-Fixed: 3799575 Change-Id: Ic11d376e2d04b49dad3185ef32ae863f60f1d759 Signed-off-by: Atiya Kailany --- bindings/msm-cam-cpas.txt | 7 +++++++ sun-camera.dtsi | 1 + 2 files changed, 8 insertions(+) diff --git a/bindings/msm-cam-cpas.txt b/bindings/msm-cam-cpas.txt index b46f9a41..39a6c62d 100644 --- a/bindings/msm-cam-cpas.txt +++ b/bindings/msm-cam-cpas.txt @@ -150,6 +150,12 @@ First Level Node - CAM CPAS device Definition: Bool property specifying whether to control camnoc axi clock from cpas driver. +- cam-crmb-clk + Usage: required + Value type: + Definition: Flag indicating whether the src clk in this node is + a crmb clk or not + - camnoc-bus-width Usage: required if control-camnoc-axi-clk is enabled Value type: @@ -509,6 +515,7 @@ Example: clock-cntl-level = "turbo"; qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>; control-camnoc-axi-clk; + cam-crmb-clk; camnoc-bus-width = <32>; camnoc-axi-clk-bw-margin-perc = <10>; qcom,msm-bus,name = "cam_ahb"; diff --git a/sun-camera.dtsi b/sun-camera.dtsi index 2d7b61c9..efa53d5b 100644 --- a/sun-camera.dtsi +++ b/sun-camera.dtsi @@ -1676,6 +1676,7 @@ <0>, <0>, <0>, <0>; shared-clks-option = <0 0 0 1 0>; control-camnoc-axi-clk; + cam-crmb-clk; camnoc-bus-width = <32>; camnoc-axi-clk-bw-margin-perc = <20>; domain-id = , From f88d988a4690b0837493cebab8bed7bf9489bb89 Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Wed, 22 May 2024 17:14:33 -0700 Subject: [PATCH 5/9] CAMX: Snap for drop 05/22/2024 mainline 1201 LA.VENDOR.15.4.0.AU345 f8b64ae Merge 'ARM: dts: msm: Add flag indicating crmb api support' into camera-kernel.lnx.dev Change-Id: I2d6dc8ca602e20ea38668491b98134b2bfd69b0a Signed-off-by: Haritha Chintalapati From 67a9b916b681326460715b85b5a2bb42aa3b6120 Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Thu, 23 May 2024 16:09:53 -0700 Subject: [PATCH 6/9] CAMX: Snap for drop 05/23/2024 mainline 1202 LA.VENDOR.15.4.0.AU345 Change-Id: I8bd6721a77149134b8d49b689ac92d6640a442d1 Signed-off-by: Haritha Chintalapati From 02d5af25356092ef89252a8b822ebd9f8be591b2 Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Mon, 27 May 2024 23:13:32 -0700 Subject: [PATCH 7/9] CAMX: Snap for drop 05/24/2024 mainline 1203 LA.VENDOR.15.4.0.AU345 Change-Id: Id8368538cee689df83b19d282514ba91db901225 Signed-off-by: Haritha Chintalapati From 06d90a0a9b0e206edf7c8ee5e83ca5fae33094de Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Wed, 29 May 2024 14:24:27 -0700 Subject: [PATCH 8/9] CAMX: Snap for drop 05/28/2024 mainline 1204 LA.VENDOR.15.4.0.AU345 Change-Id: I3ac82a366042c109740d0405723b5245bd731e9a Signed-off-by: Haritha Chintalapati From 0de991422c6eedb40a45a7980730826bb9569a53 Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Wed, 29 May 2024 17:32:04 -0700 Subject: [PATCH 9/9] CAMX: Snap for drop 05/29/2024 mainline 1205 LA.VENDOR.15.4.0.AU354 Change-Id: I44cd2e2f6981ba591dd5965e9391ef454ff38256 Signed-off-by: Haritha Chintalapati