From 9144871df1e9ee482ac70c93a530e0c49934b198 Mon Sep 17 00:00:00 2001 From: Dharmender Sharma Date: Wed, 18 Dec 2024 10:58:04 +0530 Subject: [PATCH 1/2] ARM: dts: msm: Add labels to camera nodes Adding labels to nodes help in faster fetching of the nodes. This commit adds labels to missing nodes. CRs-Fixed: 4013261 Change-Id: I088fc1fcd44836e0739c1fdaf7a4c86634f2eb52 Signed-off-by: Dharmender Sharma --- kera-camera.dtsi | 26 +++++++++++++------------- sun-camera.dtsi | 28 ++++++++++++++-------------- tuna-camera.dtsi | 28 ++++++++++++++-------------- 3 files changed, 41 insertions(+), 41 deletions(-) diff --git a/kera-camera.dtsi b/kera-camera.dtsi index 0054234b..2b273509 100644 --- a/kera-camera.dtsi +++ b/kera-camera.dtsi @@ -461,12 +461,12 @@ #size-cells = <1>; interrupt-parent = <&intc>; - qcom,cam-req-mgr { + cam_req_mgr: qcom,cam-req-mgr { compatible = "qcom,cam-req-mgr"; status = "ok"; }; - qcom,cam-sync { + cam_sync: qcom,cam-sync { compatible = "qcom,cam-sync"; status = "ok"; }; @@ -867,7 +867,7 @@ status = "ok"; }; - qcom,cam_smmu { + cam_smmu: qcom,cam_smmu { compatible = "qcom,msm-cam-smmu", "simple-bus"; status = "ok"; expanded_memory; @@ -1125,7 +1125,7 @@ }; }; - qcom,cam-cpas@ac04000 { + cam_cpas: qcom,cam-cpas@ac04000 { cell-index = <0>; compatible = "qcom,cam-cpas"; label = "cpas"; @@ -1888,7 +1888,7 @@ }; }; - qcom,cam-cdm-intf { + cam_cdm_intf: qcom,cam-cdm-intf { compatible = "qcom,cam-cdm-intf"; cell-index = <0>; label = "cam-cdm-intf"; @@ -1899,7 +1899,7 @@ status = "ok"; }; - qcom,rt-cdm0@ac7f000 { + cam_rt_cdm0: qcom,rt-cdm0@ac7f000 { cell-index = <0>; compatible = "qcom,cam-rt-cdm2_2"; label = "rt-cdm"; @@ -1924,7 +1924,7 @@ status = "ok"; }; - qcom,rt-cdm1@ac80000 { + cam_rt_cdm1: qcom,rt-cdm1@ac80000 { cell-index = <1>; compatible = "qcom,cam-rt-cdm2_2"; label = "rt-cdm"; @@ -1949,7 +1949,7 @@ status = "ok"; }; - qcom,rt-cdm2@ac81000 { + cam_rt_cdm2: qcom,rt-cdm2@ac81000 { cell-index = <2>; compatible = "qcom,cam-rt-cdm2_2"; label = "rt-cdm"; @@ -1974,7 +1974,7 @@ status = "ok"; }; - qcom,rt-cdm3@ac82000 { + cam_rt_cdm3: qcom,rt-cdm3@ac82000 { cell-index = <3>; compatible = "qcom,cam-rt-cdm2_2"; label = "rt-cdm"; @@ -1999,7 +1999,7 @@ status = "ok"; }; - qcom,cam-isp { + cam_isp: qcom,cam-isp { compatible = "qcom,cam-isp"; arch-compat = "mc_tfe"; status = "ok"; @@ -2308,7 +2308,7 @@ status = "ok"; }; - qcom,cam-icp0 { + icp0: qcom,cam-icp0 { compatible = "qcom,cam-icp0"; cell-index = <0>; compat-hw-name = "qcom,icp0", @@ -2322,7 +2322,7 @@ synx_signaling_en; }; - qcom,cam-icp1 { + icp1: qcom,cam-icp1 { compatible = "qcom,cam-icp1"; cell-index = <1>; compat-hw-name = "qcom,icp1", @@ -2503,7 +2503,7 @@ status = "ok"; }; - qcom,cam-jpeg { + cam_jpeg: qcom,cam-jpeg { compatible = "qcom,cam-jpeg"; compat-hw-name = "qcom,jpegenc0", "qcom,jpegdma0"; diff --git a/sun-camera.dtsi b/sun-camera.dtsi index 7adef2b5..dbd4c592 100644 --- a/sun-camera.dtsi +++ b/sun-camera.dtsi @@ -858,12 +858,12 @@ #size-cells = <1>; interrupt-parent = <&intc>; - qcom,cam-req-mgr { + cam_req_mgr: qcom,cam-req-mgr { compatible = "qcom,cam-req-mgr"; status = "ok"; }; - qcom,cam-sync { + cam_sync: qcom,cam-sync { compatible = "qcom,cam-sync"; status = "ok"; }; @@ -1344,7 +1344,7 @@ }; }; - qcom,cam_smmu { + cam_smmu: qcom,cam_smmu { compatible = "qcom,msm-cam-smmu", "simple-bus"; status = "ok"; expanded_memory; @@ -1606,7 +1606,7 @@ }; }; - qcom,cam-cpas@ac13000 { + cam_cpas: qcom,cam-cpas@ac13000 { cell-index = <0>; compatible = "qcom,cam-cpas"; label = "cpas"; @@ -2473,7 +2473,7 @@ }; }; - qcom,cam-cdm-intf { + cam_cdm_intf: qcom,cam-cdm-intf { compatible = "qcom,cam-cdm-intf"; cell-index = <0>; label = "cam-cdm-intf"; @@ -2484,7 +2484,7 @@ status = "ok"; }; - qcom,rt-cdm0@ac7f000 { + cam_rt_cdm0: qcom,rt-cdm0@ac7f000 { cell-index = <0>; compatible = "qcom,cam-rt-cdm2_2"; label = "rt-cdm"; @@ -2509,7 +2509,7 @@ status = "ok"; }; - qcom,rt-cdm1@ac80000 { + cam_rt_cdm1: qcom,rt-cdm1@ac80000 { cell-index = <1>; compatible = "qcom,cam-rt-cdm2_2"; label = "rt-cdm"; @@ -2534,7 +2534,7 @@ status = "ok"; }; - qcom,rt-cdm2@ac81000 { + cam_rt_cdm2: qcom,rt-cdm2@ac81000 { cell-index = <2>; compatible = "qcom,cam-rt-cdm2_2"; label = "rt-cdm"; @@ -2559,7 +2559,7 @@ status = "ok"; }; - qcom,rt-cdm3@ac82000 { + cam_rt_cdm3: qcom,rt-cdm3@ac82000 { cell-index = <3>; compatible = "qcom,cam-rt-cdm2_2"; label = "rt-cdm"; @@ -2584,7 +2584,7 @@ status = "ok"; }; - qcom,rt-cdm4@ac83000 { + cam_rt_cdm4: qcom,rt-cdm4@ac83000 { cell-index = <4>; compatible = "qcom,cam-rt-cdm2_2"; label = "rt-cdm"; @@ -2609,7 +2609,7 @@ status = "ok"; }; - qcom,cam-isp { + cam_isp: qcom,cam-isp { compatible = "qcom,cam-isp"; arch-compat = "mc_tfe"; status = "ok"; @@ -3095,7 +3095,7 @@ status = "ok"; }; - qcom,cam-icp0 { + icp0: qcom,cam-icp0 { compatible = "qcom,cam-icp0"; cell-index = <0>; compat-hw-name = "qcom,icp0", @@ -3109,7 +3109,7 @@ synx_signaling_en; }; - qcom,cam-icp1 { + icp1: qcom,cam-icp1 { compatible = "qcom,cam-icp1"; cell-index = <1>; compat-hw-name = "qcom,icp1", @@ -3298,7 +3298,7 @@ status = "ok"; }; - qcom,cam-jpeg { + cam_jpeg: qcom,cam-jpeg { compatible = "qcom,cam-jpeg"; compat-hw-name = "qcom,jpegenc0", "qcom,jpegdma0"; diff --git a/tuna-camera.dtsi b/tuna-camera.dtsi index bc066f1e..e2cf7633 100644 --- a/tuna-camera.dtsi +++ b/tuna-camera.dtsi @@ -491,12 +491,12 @@ #size-cells = <1>; interrupt-parent = <&intc>; - qcom,cam-req-mgr { + cam_req_mgr: qcom,cam-req-mgr { compatible = "qcom,cam-req-mgr"; status = "ok"; }; - qcom,cam-sync { + cam_sync: qcom,cam-sync { compatible = "qcom,cam-sync"; status = "ok"; }; @@ -847,7 +847,7 @@ }; }; - qcom,cam_smmu { + cam_smmu: qcom,cam_smmu { compatible = "qcom,msm-cam-smmu", "simple-bus"; status = "ok"; expanded_memory; @@ -1109,7 +1109,7 @@ }; }; - qcom,cam-cpas@ac13000 { + cam_cpas: qcom,cam-cpas@ac13000 { cell-index = <0>; compatible = "qcom,cam-cpas"; label = "cpas"; @@ -1932,7 +1932,7 @@ }; }; - qcom,cam-cdm-intf { + cam_cdm_intf: qcom,cam-cdm-intf { compatible = "qcom,cam-cdm-intf"; cell-index = <0>; label = "cam-cdm-intf"; @@ -1943,7 +1943,7 @@ status = "ok"; }; - qcom,rt-cdm0@ac7f000 { + cam_rt_cdm0: qcom,rt-cdm0@ac7f000 { cell-index = <0>; compatible = "qcom,cam-rt-cdm2_2"; label = "rt-cdm"; @@ -1968,7 +1968,7 @@ status = "ok"; }; - qcom,rt-cdm1@ac80000 { + cam_rt_cdm1: qcom,rt-cdm1@ac80000 { cell-index = <1>; compatible = "qcom,cam-rt-cdm2_2"; label = "rt-cdm"; @@ -1993,7 +1993,7 @@ status = "ok"; }; - qcom,rt-cdm2@ac81000 { + cam_rt_cdm2: qcom,rt-cdm2@ac81000 { cell-index = <2>; compatible = "qcom,cam-rt-cdm2_2"; label = "rt-cdm"; @@ -2018,7 +2018,7 @@ status = "ok"; }; - qcom,rt-cdm3@ac82000 { + cam_rt_cdm3: qcom,rt-cdm3@ac82000 { cell-index = <3>; compatible = "qcom,cam-rt-cdm2_2"; label = "rt-cdm"; @@ -2043,7 +2043,7 @@ status = "ok"; }; - qcom,rt-cdm4@ac83000 { + cam_rt_cdm4: qcom,rt-cdm4@ac83000 { cell-index = <4>; compatible = "qcom,cam-rt-cdm2_2"; label = "rt-cdm"; @@ -2068,7 +2068,7 @@ status = "ok"; }; - qcom,cam-isp { + cam_isp: qcom,cam-isp { compatible = "qcom,cam-isp"; arch-compat = "mc_tfe"; status = "ok"; @@ -2554,7 +2554,7 @@ status = "ok"; }; - qcom,cam-icp0 { + icp0: qcom,cam-icp0 { compatible = "qcom,cam-icp0"; cell-index = <0>; compat-hw-name = "qcom,icp0", @@ -2568,7 +2568,7 @@ synx_signaling_en; }; - qcom,cam-icp1 { + icp1: qcom,cam-icp1 { compatible = "qcom,cam-icp1"; cell-index = <1>; compat-hw-name = "qcom,icp1", @@ -2757,7 +2757,7 @@ status = "ok"; }; - qcom,cam-jpeg { + cam_jpeg: qcom,cam-jpeg { compatible = "qcom,cam-jpeg"; compat-hw-name = "qcom,jpegenc0", "qcom,jpegdma0"; From bd5e77ea6b63f25212cd506fec258795f1639cfe Mon Sep 17 00:00:00 2001 From: Alok Chauhan Date: Tue, 31 Dec 2024 13:22:11 +0530 Subject: [PATCH 2/2] ARM: dts: msm: Add support for resource resets for Eliza Add reset support for GCC axi RT/NRT resources. This is HW WA fix for DDR 2.1 Ghz. CRs-Fixed: 4013241 Change-Id: I4158d337ff4f5d83ce1919939ab1d9d3e65c8fcc --- kera-camera.dtsi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/kera-camera.dtsi b/kera-camera.dtsi index 0054234b..a1557f07 100644 --- a/kera-camera.dtsi +++ b/kera-camera.dtsi @@ -1255,6 +1255,24 @@ rt-wr-highstress-indicator-threshold = <50>; rt-wr-lowstress-indicator-threshold = <0>; rt-wr-bw-ratio-scale-factor = <1>; + + resets = <&gcc GCC_CAMERA_HF_AXI_SLP_STG_ARES>, + <&gcc GCC_CAMERA_SF_AXI_SLP_STG_ARES>, + <&gcc GCC_CAMERA_HF_AXI_SEL_SLP_STG_ARES>, + <&gcc GCC_CAMERA_SF_AXI_SEL_SLP_STG_ARES>, + <&gcc GCC_CAMERA_SF_CLK_EN_SLP_STG>, + <&gcc GCC_CAMERA_SF_CLK_EN_SEL_SLP_STG>, + <&gcc GCC_CAMERA_HF_CLK_EN_SLP_STG>, + <&gcc GCC_CAMERA_HF_CLK_EN_SEL_SLP_STG>; + reset-names = "hf_slp_stg_ares", + "sf_slp_stg_ares", + "hf_sel_slp_stg_ares", + "sf_sel_slp_stg_ares", + "sf_clk_en_slp_stg", + "sf_clk_en_sel_slp_stg", + "hf_clk_en_slp_stg", + "hf_clk_en_sel_slp_stg"; + status = "ok"; camera-bus-nodes {