From 7e1660cc9bf602f92c702ba754fbe5783c4e6b46 Mon Sep 17 00:00:00 2001 From: Atiya Kailany Date: Tue, 13 Feb 2024 11:45:01 -0800 Subject: [PATCH 01/26] ARM: dts: msm: Adding lowsvsd1 vote level to device tree This change adds lowsvsd1 vote level along with corresponding rates to the device tree. CRs-Fixed: 3678245 Change-Id: I99bc0cc781edfe9b31aedc1970d0d1b5ccded7d7 Signed-off-by: Atiya Kailany --- sun-camera.dtsi | 87 +++++++++++++++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 35 deletions(-) diff --git a/sun-camera.dtsi b/sun-camera.dtsi index d961853c..bd25bf59 100644 --- a/sun-camera.dtsi +++ b/sun-camera.dtsi @@ -897,8 +897,9 @@ <&camcc CAM_CC_CSI0PHYTIMER_CLK_SRC>, <&camcc CAM_CC_CSI0PHYTIMER_CLK>; src-clock-name = "cphy_rx_clk_src"; - clock-cntl-level = "lowsvs", "nominal"; + clock-cntl-level = "lowsvsd1", "lowsvs", "nominal"; clock-rates = + <266666667 0 400000000 0>, <400000000 0 400000000 0>, <480000000 0 400000000 0>; status = "ok"; @@ -930,8 +931,9 @@ <&camcc CAM_CC_CSI1PHYTIMER_CLK_SRC>, <&camcc CAM_CC_CSI1PHYTIMER_CLK>; src-clock-name = "cphy_rx_clk_src"; - clock-cntl-level = "lowsvs", "nominal"; + clock-cntl-level = "lowsvsd1", "lowsvs", "nominal"; clock-rates = + <266666667 0 400000000 0>, <400000000 0 400000000 0>, <480000000 0 400000000 0>; status = "ok"; @@ -963,8 +965,9 @@ <&camcc CAM_CC_CSI2PHYTIMER_CLK_SRC>, <&camcc CAM_CC_CSI2PHYTIMER_CLK>; src-clock-name = "cphy_rx_clk_src"; - clock-cntl-level = "lowsvs", "nominal"; + clock-cntl-level = "lowsvsd1", "lowsvs", "nominal"; clock-rates = + <266666667 0 400000000 0>, <400000000 0 400000000 0>, <480000000 0 400000000 0>; status = "ok"; @@ -996,8 +999,9 @@ <&camcc CAM_CC_CSI3PHYTIMER_CLK_SRC>, <&camcc CAM_CC_CSI3PHYTIMER_CLK>; src-clock-name = "cphy_rx_clk_src"; - clock-cntl-level = "lowsvs", "nominal"; + clock-cntl-level = "lowsvsd1", "lowsvs", "nominal"; clock-rates = + <266666667 0 400000000 0>, <400000000 0 400000000 0>, <480000000 0 400000000 0>; status = "ok"; @@ -1029,8 +1033,9 @@ <&camcc CAM_CC_CSI4PHYTIMER_CLK_SRC>, <&camcc CAM_CC_CSI4PHYTIMER_CLK>; src-clock-name = "cphy_rx_clk_src"; - clock-cntl-level = "lowsvs", "nominal"; + clock-cntl-level = "lowsvsd1", "lowsvs", "nominal"; clock-rates = + <266666667 0 400000000 0>, <400000000 0 400000000 0>, <480000000 0 400000000 0>; status = "ok"; @@ -1062,8 +1067,9 @@ <&camcc CAM_CC_CSI5PHYTIMER_CLK_SRC>, <&camcc CAM_CC_CSI5PHYTIMER_CLK>; src-clock-name = "cphy_rx_clk_src"; - clock-cntl-level = "lowsvs", "nominal"; + clock-cntl-level = "lowsvsd1", "lowsvs", "nominal"; clock-rates = + <266666667 0 400000000 0>, <400000000 0 400000000 0>, <480000000 0 400000000 0>; status = "ok"; @@ -1083,8 +1089,8 @@ "cci_0_clk"; clocks = <&camcc CAM_CC_CCI_0_CLK_SRC>, <&camcc CAM_CC_CCI_0_CLK>; - clock-rates = <37500000 0>; - clock-cntl-level = "lowsvs"; + clock-rates = <37500000 0>, <37500000 0>; + clock-cntl-level = "lowsvsd1", "lowsvs"; src-clock-name = "cci_0_clk_src"; pctrl-idx-mapping = ; pctrl-map-names = "m0", "m1"; @@ -1171,8 +1177,8 @@ "cci_1_clk"; clocks = <&camcc CAM_CC_CCI_1_CLK_SRC>, <&camcc CAM_CC_CCI_1_CLK>; - clock-rates = <37500000 0>; - clock-cntl-level = "lowsvs"; + clock-rates = <37500000 0>, <37500000 0>; + clock-cntl-level = "lowsvsd1", "lowsvs"; src-clock-name = "cci_1_clk_src"; pctrl-idx-mapping = ; pctrl-map-names = "m0", "m1"; @@ -1259,8 +1265,8 @@ "cci_2_clk"; clocks = <&camcc CAM_CC_CCI_2_CLK_SRC>, <&camcc CAM_CC_CCI_2_CLK>; - clock-rates = <37500000 0>; - clock-cntl-level = "lowsvs"; + clock-rates = <37500000 0>, <37500000 0>; + clock-cntl-level = "lowsvsd1", "lowsvs"; src-clock-name = "cci_2_clk_src"; pctrl-idx-mapping = ; pctrl-map-names = "m0", "m1"; @@ -1647,14 +1653,15 @@ <&camcc CAM_CC_QDSS_DEBUG_XO_CLK>; clock-rates = <0 0 0 0 0 0 0 0 0 0 0 0 0 0 0>, + <0 0 0 56470588 0 0 0 213333333 0 200000000 0 0 0 0 0>, <0 0 0 80000000 0 0 0 300000000 0 300000000 0 0 0 0 0>, <0 0 0 80000000 0 0 0 300000000 0 400000000 0 0 0 0 0>, <0 0 0 80000000 0 0 0 300000000 0 400000000 0 0 0 0 0>, <0 0 0 80000000 0 0 0 400000000 0 400000000 0 0 0 0 0>, <0 0 0 80000000 0 0 0 400000000 0 400000000 0 0 0 0 0>, <0 0 0 80000000 0 0 0 400000000 0 400000000 0 0 0 0 0>; - clock-cntl-level = "suspend", "lowsvs", "svs", "svs_l1", - "nominal", "nominal_l1", "turbo"; + clock-cntl-level = "suspend", "lowsvsd1", "lowsvs", "svs", + "svs_l1", "nominal", "nominal_l1", "turbo"; src-clock-name = "camnoc_rt_axi_clk_src"; domain-id-support-clks = "ife_lite_csid_clk", "ife_lite_ahb", "csid_clk_src", "csid_clk"; @@ -2620,13 +2627,14 @@ <&camcc CAM_CC_CSID_CLK>, <&camcc CAM_CC_CSID_CSIPHY_RX_CLK>; clock-rates = + <266666667 0 0>, <400000000 0 0>, <480000000 0 0>, <480000000 0 0>, <480000000 0 0>, <480000000 0 0>; - clock-cntl-level = "lowsvs", "svs", "svs_l1", "nominal", - "turbo"; + clock-cntl-level = "lowsvsd1", "lowsvs", "svs", + "svs_l1", "nominal", "turbo"; src-clock-name = "csid_clk_src"; clock-control-debugfs = "true"; status = "ok"; @@ -2662,7 +2670,7 @@ <&camcc CAM_CC_TFE_0_BAYER_CLK>, <&camcc CAM_CC_CAMNOC_RT_TFE_0_BAYER_CLK>; clock-rates = - <0 360000000 0 0 0 0 0>, + <0 360280000 0 0 0 0 0>, <0 480000000 0 0 0 0 0>, <0 630000000 0 0 0 0 0>, <0 716000000 0 0 0 0 0>, @@ -2698,13 +2706,14 @@ <&camcc CAM_CC_CSID_CLK>, <&camcc CAM_CC_CSID_CSIPHY_RX_CLK>; clock-rates = + <266666667 0 0>, <400000000 0 0>, <480000000 0 0>, <480000000 0 0>, <480000000 0 0>, <480000000 0 0>; - clock-cntl-level = "lowsvs", "svs", "svs_l1", "nominal", - "turbo"; + clock-cntl-level = "lowsvsd1", "lowsvs", "svs", + "svs_l1", "nominal", "turbo"; src-clock-name = "csid_clk_src"; clock-control-debugfs = "true"; status = "ok"; @@ -2740,7 +2749,7 @@ <&camcc CAM_CC_TFE_1_BAYER_CLK>, <&camcc CAM_CC_CAMNOC_RT_TFE_1_BAYER_CLK>; clock-rates = - <0 360000000 0 0 0 0 0>, + <0 360280000 0 0 0 0 0>, <0 480000000 0 0 0 0 0>, <0 630000000 0 0 0 0 0>, <0 716000000 0 0 0 0 0>, @@ -2776,13 +2785,14 @@ <&camcc CAM_CC_CSID_CLK>, <&camcc CAM_CC_CSID_CSIPHY_RX_CLK>; clock-rates = + <266666667 0 0>, <400000000 0 0>, <480000000 0 0>, <480000000 0 0>, <480000000 0 0>, <480000000 0 0>; - clock-cntl-level = "lowsvs", "svs", "svs_l1", "nominal", - "turbo"; + clock-cntl-level = "lowsvsd1", "lowsvs", "svs", + "svs_l1", "nominal", "turbo"; src-clock-name = "csid_clk_src"; clock-control-debugfs = "true"; status = "ok"; @@ -2818,7 +2828,7 @@ <&camcc CAM_CC_TFE_2_BAYER_CLK>, <&camcc CAM_CC_CAMNOC_RT_TFE_2_BAYER_CLK>; clock-rates = - <0 360000000 0 0 0 0 0>, + <0 360280000 0 0 0 0 0>, <0 480000000 0 0 0 0 0>, <0 630000000 0 0 0 0 0>, <0 716000000 0 0 0 0 0>, @@ -2860,13 +2870,14 @@ <&camcc CAM_CC_IFE_LITE_CLK>, <&camcc CAM_CC_CAMNOC_RT_IFE_LITE_CLK>; clock-rates = + <0 266666667 0 0 0 0>, <0 400000000 0 0 0 0>, <0 480000000 0 0 0 0>, <0 480000000 0 0 0 0>, <0 480000000 0 0 0 0>, <0 480000000 0 0 0 0>; - clock-cntl-level = "lowsvs", "svs", "svs_l1", "nominal", - "turbo"; + clock-cntl-level = "lowsvsd1", "lowsvs", "svs", + "svs_l1", "nominal", "turbo"; src-clock-name = "ife_lite_csid_clk_src"; clock-control-debugfs = "true"; status = "ok"; @@ -2899,13 +2910,14 @@ <&camcc CAM_CC_IFE_LITE_CLK>, <&camcc CAM_CC_CAMNOC_RT_IFE_LITE_CLK>; clock-rates = + <0 0 0 266666667 0 0>, <0 0 0 400000000 0 0>, <0 0 0 480000000 0 0>, <0 0 0 480000000 0 0>, <0 0 0 480000000 0 0>, <0 0 0 480000000 0 0>; - clock-cntl-level = "lowsvs", "svs", "svs_l1", "nominal", - "turbo"; + clock-cntl-level = "lowsvsd1", "lowsvs", "svs", + "svs_l1", "nominal", "turbo"; src-clock-name = "ife_lite_clk_src"; clock-control-debugfs = "true"; cam_hw_pid = <19>; @@ -2939,13 +2951,14 @@ <&camcc CAM_CC_IFE_LITE_CLK>, <&camcc CAM_CC_CAMNOC_RT_IFE_LITE_CLK>; clock-rates = + <0 266666667 0 0 0 0>, <0 400000000 0 0 0 0>, <0 480000000 0 0 0 0>, <0 480000000 0 0 0 0>, <0 480000000 0 0 0 0>, <0 480000000 0 0 0 0>; - clock-cntl-level = "lowsvs", "svs", "svs_l1", "nominal", - "turbo"; + clock-cntl-level = "lowsvsd1", "lowsvs", "svs", + "svs_l1", "nominal", "turbo"; src-clock-name = "ife_lite_csid_clk_src"; clock-control-debugfs = "true"; status = "ok"; @@ -2978,13 +2991,14 @@ <&camcc CAM_CC_IFE_LITE_CLK>, <&camcc CAM_CC_CAMNOC_RT_IFE_LITE_CLK>; clock-rates = + <0 0 0 266666667 0 0>, <0 0 0 400000000 0 0>, <0 0 0 480000000 0 0>, <0 0 0 480000000 0 0>, <0 0 0 480000000 0 0>, <0 0 0 480000000 0 0>; - clock-cntl-level = "lowsvs", "svs", "svs_l1", "nominal", - "turbo"; + clock-cntl-level = "lowsvsd1", "lowsvs", "svs", + "svs_l1", "nominal", "turbo"; src-clock-name = "ife_lite_clk_src"; clock-control-debugfs = "true"; cam_hw_pid = <20>; @@ -3011,9 +3025,10 @@ <&camcc CAM_CC_CPHY_RX_CLK_SRC>, <&camcc CAM_CC_CSID_CSIPHY_RX_CLK>; clock-rates = + <266666667 0>, <400000000 0>, <480000000 0>; - clock-cntl-level = "lowsvs", "nominal"; + clock-cntl-level = "lowsvsd1", "lowsvs", "nominal"; src-clock-name = "cphy_rx_clk_src"; status = "ok"; }; @@ -3038,9 +3053,10 @@ <&camcc CAM_CC_CPHY_RX_CLK_SRC>, <&camcc CAM_CC_CSID_CSIPHY_RX_CLK>; clock-rates = + <266666667 0>, <400000000 0>, <480000000 0>; - clock-cntl-level = "lowsvs", "nominal"; + clock-cntl-level = "lowsvsd1", "lowsvs", "nominal"; src-clock-name = "cphy_rx_clk_src"; status = "ok"; }; @@ -3065,9 +3081,10 @@ <&camcc CAM_CC_CPHY_RX_CLK_SRC>, <&camcc CAM_CC_CSID_CSIPHY_RX_CLK>; clock-rates = + <266666667 0>, <400000000 0>, <480000000 0>; - clock-cntl-level = "lowsvs", "nominal"; + clock-cntl-level = "lowsvsd1", "lowsvs", "nominal"; src-clock-name = "cphy_rx_clk_src"; status = "ok"; }; @@ -3261,7 +3278,7 @@ <&camcc CAM_CC_OFE_HDR_CLK>, <&camcc CAM_CC_OFE_MAIN_FAST_AHB_CLK>; clock-rates = - <0 0 338000000 0 0 0 0 0 0 0 0>, + <0 0 338800000 0 0 0 0 0 0 0 0>, <0 0 484000000 0 0 0 0 0 0 0 0>, <0 0 586000000 0 0 0 0 0 0 0 0>, <0 0 688000000 0 0 0 0 0 0 0 0>, From 8574e854d2e3ddb1644c698396fb889656b874eb Mon Sep 17 00:00:00 2001 From: Wasim Khan Date: Tue, 13 Feb 2024 11:45:06 -0800 Subject: [PATCH 02/26] CAMX: Snap for drop 02/12/2024 mainline 1138 LA.VENDOR.15.4.0.AU231 a13cdd3 Merge 'ARM: dts: msm: Adding lowsvsd1 vote level to device tree' into camera-kernel.lnx.dev Change-Id: I377546fcbc4070f6cebe5f0b071786b2d69933d7 Signed-off-by: Wasim Khan From f53fe7d7e0058b27e9823c82e62f273147b9b516 Mon Sep 17 00:00:00 2001 From: Wasim Khan Date: Wed, 14 Feb 2024 12:38:08 -0800 Subject: [PATCH 03/26] CAMX: Snap for drop 02/13/2024 mainline 1139 LA.VENDOR.15.4.0.AU240 Change-Id: Id42129a7c728e11f02da98837cacd91796f9ec6e Signed-off-by: Wasim Khan From ee79b6b788450ebc763d32fb57ac0fedc0f7a6f7 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Aakulu Date: Fri, 16 Feb 2024 10:19:15 -0800 Subject: [PATCH 04/26] ARM: dts: msm: Add new board-id for camera sensor Add new Board id information for multiple types of RCM devices. CRs-Fixed: 3731095 Change-Id: I8576e29d754b949851636ed9e6fc5555b55a3a03 Signed-off-by: Lokesh Kumar Aakulu --- sun-camera-sensor-cdp.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sun-camera-sensor-cdp.dts b/sun-camera-sensor-cdp.dts index 8c06d501..fcd2b648 100644 --- a/sun-camera-sensor-cdp.dts +++ b/sun-camera-sensor-cdp.dts @@ -13,5 +13,5 @@ model = "Qualcomm Technologies, Inc. Sun CDP/RCM"; compatible = "qcom,sun-cdp", "qcom,sun", "qcom,cdp", "qcom,rcm", "qcom,sun-rcm"; qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; - qcom,board-id = <1 0>, <21 0>, <0x20001 0>, <0x50001 0>, <0x60001 0>; + qcom,board-id = <1 0>, <21 0>, <0x20001 0>, <0x50001 0>, <0x60001 0>, <0x30015 0>, <0x40015 0>, <0x20015 0>; }; From 096530b3fd973806afe03c685f05a5cb4e7938df Mon Sep 17 00:00:00 2001 From: Wasim Khan Date: Wed, 14 Feb 2024 18:55:49 -0800 Subject: [PATCH 05/26] CAMX: Snap for drop 02/14/2024 mainline 1140 LA.VENDOR.15.4.0.AU240 Change-Id: I79d510e44ed2fcfab6069daa1996ecd38fa21625 Signed-off-by: Wasim Khan From 38ca4495b47c2ea39f52bc4b14811047bd104eba Mon Sep 17 00:00:00 2001 From: Wasim Khan Date: Fri, 16 Feb 2024 11:01:57 -0800 Subject: [PATCH 06/26] CAMX: Snap for drop 02/15/2024 mainline 1141 LA.VENDOR.15.4.0.AU240 Change-Id: I18accf07db427f8e43eda5a6b5023ab41286878a Signed-off-by: Wasim Khan From 9b30bf7e2186cb514f61ed3ffaff749321dba312 Mon Sep 17 00:00:00 2001 From: Wasim Khan Date: Wed, 21 Feb 2024 11:42:58 -0800 Subject: [PATCH 07/26] CAMX: Snap for drop 02/20/2024 mainline 1142 LA.VENDOR.15.4.0.AU240 Change-Id: I2a0d8d04933efed741d0d2811d3980987e408979 Signed-off-by: Wasim Khan From fd496fbcb5b0ef28b214fc0654503e01646eaa4b Mon Sep 17 00:00:00 2001 From: Wasim Khan Date: Wed, 21 Feb 2024 22:58:06 -0800 Subject: [PATCH 08/26] CAMX: Snap for drop 02/21/2024 mainline 1143 LA.VENDOR.15.4.0.AU248 17f0dce Merge 'ARM: dts: msm: Add new board-id for camera sensor' into camera-kernel.lnx.dev Change-Id: I35cd58d3dbac34c42446b4dc8f89bd0f80300133 Signed-off-by: Wasim Khan From 117b2efb1c72d919a9f8ca10fc1b2a795c931296 Mon Sep 17 00:00:00 2001 From: Wasim Khan Date: Thu, 22 Feb 2024 15:44:37 -0800 Subject: [PATCH 09/26] CAMX: Snap for drop 02/22/2024 mainline 1144 LA.VENDOR.15.4.0.AU248 Change-Id: Ia81eb7039c455be457e5971381e3dfb98332702d Signed-off-by: Wasim Khan From ff78043d9c56fed323af2beff71692f22eba3094 Mon Sep 17 00:00:00 2001 From: Wasim Khan Date: Fri, 23 Feb 2024 12:18:03 -0800 Subject: [PATCH 10/26] CAMX: Snap for drop 02/23/2024 mainline 1145 LA.VENDOR.15.4.0.AU248 Change-Id: I96a92aa53723053fbc2b5530c079069fbb2592df Signed-off-by: Wasim Khan From dae3881909346118d95ed6b4c03c9257ec897c95 Mon Sep 17 00:00:00 2001 From: Wasim Khan Date: Mon, 26 Feb 2024 13:30:04 -0800 Subject: [PATCH 11/26] CAMX: Snap for drop 02/26/2024 mainline 1146 LA.VENDOR.15.4.0.AU248 Change-Id: Ib2febf335d30caa2dd5e60dc516007ba24777502 Signed-off-by: Wasim Khan From 8fd98a95e8cc5ee5cde2e1af96a8fa33bc9caaf0 Mon Sep 17 00:00:00 2001 From: Wasim Khan Date: Tue, 27 Feb 2024 11:20:01 -0800 Subject: [PATCH 12/26] CAMX: Snap for drop 02/27/2024 mainline 1147 LA.VENDOR.15.4.0.AU248 Change-Id: I06370ccff5990e394cd8bf896f7dd6c9fa4ccd99 Signed-off-by: Wasim Khan From 96bc031355a04e05684a58762675ea8180d0330e Mon Sep 17 00:00:00 2001 From: Ashish Bhimanpalliwar Date: Wed, 28 Feb 2024 14:48:18 -0800 Subject: [PATCH 13/26] ARM: dts: msm: Add icp dt nodes in tvm camera device tree Add ICP, BPS, IPE related device tree nodes in tvm camera device tree for pineapple. CRs-Fixed: 3706497 Change-Id: I55c1c0fde26af6b841620bbd3d31ceaa87713934 Signed-off-by: Ashish Bhimanpalliwar --- trustedvm-pineapple-camera.dtsi | 133 ++++++++++++++++++++++---------- 1 file changed, 94 insertions(+), 39 deletions(-) diff --git a/trustedvm-pineapple-camera.dtsi b/trustedvm-pineapple-camera.dtsi index de791bd2..8d571974 100644 --- a/trustedvm-pineapple-camera.dtsi +++ b/trustedvm-pineapple-camera.dtsi @@ -1258,23 +1258,25 @@ msm_cam_smmu_icp { compatible = "qcom,msm-cam-smmu-cb"; - iommus = <&apps_smmu 0x1820 0x00>, - <&apps_smmu 0x18C0 0x00>, - <&apps_smmu 0x1800 0x00>, - <&apps_smmu 0x1840 0x00>, - <&apps_smmu 0x1880 0x00>; + iommus = <&apps_smmu 0x18C2 0x00>, + <&apps_smmu 0x1841 0x00>, + <&apps_smmu 0x1881 0x00>, + <&apps_smmu 0x1808 0x20>; cam-smmu-label = "icp"; qcom,iommu-faults = "stall-disable", "non-fatal"; - qcom,iommu-dma-addr-pool = <0x0 0xf9500000 0xf 0x06a00000>; + /* dma-addr-pool is iova address range for io region */ + /* here size of dma-addr-pool is appoximately 2.5GB */ + qcom,iommu-dma-addr-pool = <0x0 0x1FF00000 0x0 0xC0000000>; dma-coherent; + /* TVM iova address range can be between 48MB to 3GB */ icp_iova_mem_map: iova-mem-map { iova-mem-region-shared { - /* Shared region is ~900MB long */ + /* Shared region is ~423MB long */ iova-region-name = "shared"; - /* Start address: 0xc0700000 */ - iova-region-start = <0x0 0xc0700000>; - /* Length: 0x38e00000 */ - iova-region-len = <0x0 0x38e00000>; + /* Start address: 0x5800000 */ + iova-region-start = <0x0 0x5800000>; + /* Length: 0x1a700000 */ + iova-region-len = <0x0 0x1a700000>; iova-region-id = <0x1>; status = "ok"; }; @@ -1282,8 +1284,8 @@ iova-mem-region-fwuncached-region { /* FW uncached region is 5 MB long */ iova-region-name = "fw_uncached"; - /* Start address: 0xc0200000 */ - iova-region-start = <0x0 0xc0200000>; + /* Start address: 0x5300000 */ + iova-region-start = <0x0 0x5300000>; /* Length: 0x500000 */ iova-region-len = <0x0 0x500000>; iova-region-id = <0x6>; @@ -1293,48 +1295,35 @@ /* Used for HFI queues/sec heap */ iova-mem-region-generic-region { iova-region-name = "icp_hfi"; - iova-region-start = <0x0 0xc0300000>; + /* Start address: 0x5300000 */ + iova-region-start = <0x0 0x5300000>; /* Length: 0x200000 */ iova-region-len = <0x0 0x200000>; iova-region-id = <0x0>; }; - /* Global Sync Memory for IPC */ - iova-mem-region-global-sync-region { - iova-region-name = "global_sync"; - iova-region-start = <0x0 0xc0200000>; - /* Length: 0x100000 */ - iova-region-len = <0x0 0x100000>; - iova-region-id = <0x2>; - phy-addr = <0x82600000>; - }; }; iova-mem-device-region { /* Device region is appropriate 1MB */ iova-region-name = "device"; - iova-region-start = <0x0 0xc0100000>; + /* Start address: 0x5200000 */ + iova-region-start = <0x0 0x5200000>; + /* Length: 0x100000 */ iova-region-len = <0x0 0x100000>; iova-region-id = <0x7>; subregion_support; status = "ok"; - iova-mem-region-synx-hwmutex { - iova-region-name = "synx_hwmutex"; - iova-region-start = <0x0 0xc0100000>; - iova-region-len = <0x0 0x1000>; - iova-region-id = <0x1>; - phy-addr = <0x1f4a000>; - }; }; iova-mem-region-io { - /* IO region is approximately 60 GB */ + /* IO region is approximately 2.5 GB */ iova-region-name = "io"; - /* Start address: 0xf9500000 */ - iova-region-start = <0x0 0xf9500000>; - /* Length: 0xf06a00000 */ - iova-region-len = <0xf 0x06a00000>; + /* Start address: 0x1FF00000 */ + iova-region-start = <0x0 0x1FF00000>; + /* Length: 0xC0000000 */ + iova-region-len = <0x0 0xC0000000>; iova-region-id = <0x3>; status = "ok"; }; @@ -1342,8 +1331,8 @@ iova-mem-qdss-region { /* QDSS region is appropriate 1MB */ iova-region-name = "qdss"; - /* Start address: 0xc0000000 */ - iova-region-start = <0x0 0xc0000000>; + /* Start address: 0x5100000 */ + iova-region-start = <0x0 0x5100000>; /* Length: 0x100000 */ iova-region-len = <0x0 0x100000>; iova-region-id = <0x5>; @@ -2646,5 +2635,71 @@ interrupts = ; status = "ok"; }; -}; + qcom,cam-icp { + compatible = "qcom,cam-icp"; + compat-hw-name = "qcom,icp", + "qcom,ipe0", + "qcom,bps"; + num-icp = <1>; + num-ipe = <1>; + num-bps = <1>; + status = "ok"; + icp_use_pil; + icp_pc_en; + }; + cam_icp: qcom,icp@ac00000 { + cell-index = <0>; + compatible = "qcom,cam-icp_v2_1"; + icp-version = <0x0201>; + reg = <0xac02000 0x1000>, + <0x0ac04000 0x1000>; + reg-names = "icp_csr", "icp_wd0"; + reg-cam-base = <0x2000 0x4000>; + interrupt-names = "icp"; + interrupts = ; + regulator-names = "gdsc"; + nrt-device; + src-clock-name = "icp_clk_src"; + clock-control-debugfs = "true"; + fw_name = "CAMERA_ICP"; + ubwc-ipe-fetch-cfg = <0x707b 0x7083>; + ubwc-ipe-write-cfg = <0x161ef 0x1620f>; + ubwc-bps-fetch-cfg = <0x707b 0x7083>; + ubwc-bps-write-cfg = <0x161ef 0x1620f>; + qos-val = <0x808>; + cam_hw_pid = <11>; + vmrm-resource-ids = <29 29 29>; + status = "ok"; + }; + + cam_ipe0: qcom,ipe0@ac42000 { + cell-index = <0>; + compatible = "qcom,cam-ipe680"; + reg = <0xac42000 0x18000>; + reg-names = "ipe0_top"; + reg-cam-base = <0x42000>; + regulator-names = "ipe0-vdd"; + nrt-device; + src-clock-name = "ipe_nps_clk_src"; + clock-control-debugfs = "true"; + cam_hw_pid = <15 14 13 31>; + vmrm-resource-ids = <30 30 30>; + status = "ok"; + }; + + cam_bps: qcom,bps@ac2c000 { + cell-index = <0>; + compatible = "qcom,cam-bps680"; + reg = <0xac2c000 0xb000>; + reg-names = "bps_top"; + reg-cam-base = <0x2c000>; + regulator-names = "bps-vdd"; + nrt-device; + src-clock-name = "bps_clk_src"; + clock-control-debugfs = "true"; + cam_hw_pid = <6 30>; + vmrm-resource-ids = <31 31 31>; + status = "ok"; + }; +}; From 6cc5ff9cb98ef8657d46ef94ca1dcfd6dce69e78 Mon Sep 17 00:00:00 2001 From: Wasim Khan Date: Wed, 28 Feb 2024 14:48:20 -0800 Subject: [PATCH 14/26] CAMX: Snap for drop 02/28/2024 mainline 1148 LA.VENDOR.15.4.0.AU254 58af205 Merge 'ARM: dts: msm: Add icp dt nodes in tvm camera device tree' into camera-kernel.lnx.dev Change-Id: Ibf503ec738dbd5f19cbe199f56c16555864c68cf Signed-off-by: Wasim Khan From 9ad9a6704f25fe56476b23cf1d3cc302bbcf0cf0 Mon Sep 17 00:00:00 2001 From: Wasim Khan Date: Thu, 29 Feb 2024 15:36:20 -0800 Subject: [PATCH 15/26] CAMX: Snap for drop 02/29/2024 mainline 1149 LA.VENDOR.15.4.0.AU254 Change-Id: Ia713511e45f606886c7f510d64f7b5fad842cd4c Signed-off-by: Wasim Khan From 6abbd1b7837de6235ef6124fa44734b6e830f72d Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Aakulu Date: Fri, 1 Mar 2024 10:47:05 -0800 Subject: [PATCH 16/26] ARM: dts: msm: Add new updated board-id for camera Add new Board id information for multiple types of CDP and MTP devices. CRs-Fixed: 3731095 Change-Id: If717a9525fd4e7c0becd72b3b4e41099be930ab7 Signed-off-by: Lokesh Kumar Aakulu --- sun-camera-sensor-cdp.dts | 2 +- sun-camera-sensor-mtp.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sun-camera-sensor-cdp.dts b/sun-camera-sensor-cdp.dts index fcd2b648..6d140a32 100644 --- a/sun-camera-sensor-cdp.dts +++ b/sun-camera-sensor-cdp.dts @@ -13,5 +13,5 @@ model = "Qualcomm Technologies, Inc. Sun CDP/RCM"; compatible = "qcom,sun-cdp", "qcom,sun", "qcom,cdp", "qcom,rcm", "qcom,sun-rcm"; qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; - qcom,board-id = <1 0>, <21 0>, <0x20001 0>, <0x50001 0>, <0x60001 0>, <0x30015 0>, <0x40015 0>, <0x20015 0>; + qcom,board-id = <1 0>, <21 0>, <0x20001 0>, <0x30001 0>, <0x40001 0>, <0x50001 0>, <0x60001 0>, <0x30015 0>, <0x40015 0>, <0x20015 0>; }; diff --git a/sun-camera-sensor-mtp.dts b/sun-camera-sensor-mtp.dts index 5a655583..008f30e5 100644 --- a/sun-camera-sensor-mtp.dts +++ b/sun-camera-sensor-mtp.dts @@ -13,5 +13,5 @@ model = "Qualcomm Technologies, Inc. Sun MTP"; compatible = "qcom,sun-mtp", "qcom,sun", "qcom,mtp"; qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; - qcom,board-id = <8 0>, <0x20008 0>, <0x40008 0>, <0x50008 0>; + qcom,board-id = <8 0>, <0x10108 0>, <0x20008 0>, <0x30008 0>, <0x40008 0>, <0x40108 0>, <0x50008 0>, <0x60008 0>; }; From 9c800374780789dc6a5107b25872d1d4692140dc Mon Sep 17 00:00:00 2001 From: Wasim Khan Date: Fri, 1 Mar 2024 10:47:07 -0800 Subject: [PATCH 17/26] CAMX: Snap for drop 03/01/2024 mainline 1150 LA.VENDOR.15.4.0.AU254 07032d8 Merge 'ARM: dts: msm: Add new updated board-id for camera' into camera-kernel.lnx.dev Change-Id: I043d3e2672c867570d71fdb0a4f452f9b825d02f Signed-off-by: Wasim Khan From 3b03f053ffc07013c802e0454a6e685da0d8d50c Mon Sep 17 00:00:00 2001 From: Wasim Khan Date: Tue, 5 Mar 2024 07:18:53 -0800 Subject: [PATCH 18/26] CAMX: Snap for drop 03/04/2024 mainline 1151 LA.VENDOR.15.4.0.AU254 Change-Id: I6cc4a106690a02c241f333580973ea73966926ad Signed-off-by: Wasim Khan From ee60b4d4e21e94d682883788b5e4fe520ebe3cce Mon Sep 17 00:00:00 2001 From: Wasim Khan Date: Thu, 7 Mar 2024 11:31:42 -0800 Subject: [PATCH 19/26] CAMX: Snap for drop 03/05/2024 mainline 1152 LA.VENDOR.15.4.0.AU262 Change-Id: I845ca8fe84adb410a331d821debf95b71f9f3135 Signed-off-by: Wasim Khan From e17b23f8003d63080763fb9b7f452a0c138f1787 Mon Sep 17 00:00:00 2001 From: Soumen Ghosh Date: Thu, 7 Mar 2024 11:31:45 -0800 Subject: [PATCH 20/26] ARM: dts: msm: enabling cesta and ddr drv This change will help to enable CLK and DDR drv feature. CRs-Fixed: 3736393 Change-Id: I6b9b76818f2d23d72936390fcfa8a961a894665b Signed-off-by: Soumen Ghosh --- sun-camera.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/sun-camera.dtsi b/sun-camera.dtsi index bd25bf59..8430eb36 100644 --- a/sun-camera.dtsi +++ b/sun-camera.dtsi @@ -1733,6 +1733,7 @@ sys-cache-uids = <71 72 73 74 75>; sys-cache-concur = <1 1 1 0 0>; enable-smart-qos; + enable-cam-drv = <(CAM_DDR_DRV | CAM_CLK_DRV)>; rt-wr-priority-min = <4>; rt-wr-priority-max = <5>; rt-wr-priority-clamp = <6>; From 05479d7c929c0f994467ab5c10bdfa05213d7df6 Mon Sep 17 00:00:00 2001 From: hchintal Date: Thu, 7 Mar 2024 11:31:47 -0800 Subject: [PATCH 21/26] CAMX: Snap for drop 03/06/2024 mainline 1153 LA.VENDOR.15.4.0.AU262 4353642 Merge 'ARM: dts: msm: enabling cesta and ddr drv' into camera-kernel.lnx.dev Change-Id: I5ced8e10a0ba6880335feb7664e7c29be0bc2e0c Signed-off-by: hchintal From 37bbd09dcd101c2edbd26432e240baa4d8bacee8 Mon Sep 17 00:00:00 2001 From: hchintal Date: Fri, 8 Mar 2024 11:33:38 -0800 Subject: [PATCH 22/26] CAMX: Snap for drop 03/07/2024 mainline 1154 LA.VENDOR.15.4.0.AU262 Change-Id: I74adb7e05cc23a90175dbb8193dc33fd7d48eda2 Signed-off-by: hchintal From b08f259547368fed939de7483aedc1c93ea48927 Mon Sep 17 00:00:00 2001 From: hchintal Date: Fri, 8 Mar 2024 11:33:40 -0800 Subject: [PATCH 23/26] CAMX: Snap for drop 03/08/2024 mainline 1155 LA.VENDOR.15.4.0.AU262 Change-Id: I510346a10fb494f91f220d433b74960d4bc1c2fd Signed-off-by: hchintal From 526f867aea233e364084bf7e286b7877180aa3ca Mon Sep 17 00:00:00 2001 From: hchintal Date: Tue, 12 Mar 2024 10:26:24 -0700 Subject: [PATCH 24/26] CAMX: Snap for drop 03/11/2024 mainline 1156 LA.VENDOR.15.4.0.AU262 Change-Id: I6f84d2641f23b9ce489b8468f6656894593c497f Signed-off-by: hchintal From 85202b39b41122758930b383557d84b8dfa4c36b Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Tue, 12 Mar 2024 15:58:57 -0700 Subject: [PATCH 25/26] CAMX: Snap for drop 03/12/2024 mainline 1157 LA.VENDOR.15.4.0.AU270 Change-Id: I6fcc7e691df6ac8237e1250557e5838bd8161ee9 Signed-off-by: Haritha Chintalapati From 3002a1df891a5f39a44965dfe4c1118bebd3c936 Mon Sep 17 00:00:00 2001 From: Haritha Chintalapati Date: Wed, 13 Mar 2024 13:17:02 -0700 Subject: [PATCH 26/26] CAMX: Snap for drop 03/13/2024 mainline 1158 LA.VENDOR.15.4.0.AU270 Change-Id: Ifd0029e28f0cc52af55ff45f9e093506a4825e02 Signed-off-by: Haritha Chintalapati