Merge ff6aa4f63e on remote branch

Change-Id: If0f359a69422fcdc3cbc019f604dffe02b2e3f34
This commit is contained in:
Linux Build Service Account
2025-05-15 02:47:50 -07:00

View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-3-Clause // SPDX-License-Identifier: BSD-3-Clause
/* /*
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved.
*/ */
#include <dt-bindings/msm-camera.h> #include <dt-bindings/msm-camera.h>
@@ -1150,13 +1150,11 @@
"cam_cc_slow_ahb_clk_src", "cam_cc_slow_ahb_clk_src",
"cpas_ahb_clk", "cpas_ahb_clk",
"cpas_core_ahb_clk", "cpas_core_ahb_clk",
"cam_cc_drv_ahb_clk",
"cam_cc_fast_ahb_clk_src", "cam_cc_fast_ahb_clk_src",
"cam_cc_top_fast_ahb_clk", "cam_cc_top_fast_ahb_clk",
"camnoc_rt_axi_clk_src", "camnoc_rt_axi_clk_src",
"camnoc_rt_axi_clk", "camnoc_rt_axi_clk",
"camnoc_nrt_axi_clk", "camnoc_nrt_axi_clk",
"cam_cc_drv_xo_clk",
"cam_cc_pll0", "cam_cc_pll0",
"cam_cc_qdss_debug_xo_clk"; "cam_cc_qdss_debug_xo_clk";
clocks = clocks =
@@ -1166,22 +1164,20 @@
<&camcc CAM_CC_SLOW_AHB_CLK_SRC>, <&camcc CAM_CC_SLOW_AHB_CLK_SRC>,
<&camcc CAM_CC_CAM_TOP_AHB_CLK>, <&camcc CAM_CC_CAM_TOP_AHB_CLK>,
<&camcc CAM_CC_CORE_AHB_CLK>, <&camcc CAM_CC_CORE_AHB_CLK>,
<&camcc CAM_CC_DRV_AHB_CLK>,
<&camcc CAM_CC_FAST_AHB_CLK_SRC>, <&camcc CAM_CC_FAST_AHB_CLK_SRC>,
<&camcc CAM_CC_CAM_TOP_FAST_AHB_CLK>, <&camcc CAM_CC_CAM_TOP_FAST_AHB_CLK>,
<&camcc CAM_CC_CAMNOC_RT_AXI_CLK_SRC>, <&camcc CAM_CC_CAMNOC_RT_AXI_CLK_SRC>,
<&camcc CAM_CC_CAMNOC_RT_AXI_CLK>, <&camcc CAM_CC_CAMNOC_RT_AXI_CLK>,
<&camcc CAM_CC_CAMNOC_NRT_AXI_CLK>, <&camcc CAM_CC_CAMNOC_NRT_AXI_CLK>,
<&camcc CAM_CC_DRV_XO_CLK>,
<&camcc CAM_CC_PLL0>, <&camcc CAM_CC_PLL0>,
<&camcc CAM_CC_QDSS_DEBUG_XO_CLK>; <&camcc CAM_CC_QDSS_DEBUG_XO_CLK>;
clock-rates = clock-rates =
<0 0 0 0 0 0 0 0 0 0 0 0 0 0 0>, <0 0 0 0 0 0 0 0 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 300000000 0 300000000 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 300000000 0 400000000 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 300000000 0 400000000 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 400000000 0 400000000 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 400000000 0 400000000 0 0 0 0>;
clock-cntl-level = "suspend", "lowsvs", "svs", clock-cntl-level = "suspend", "lowsvs", "svs",
"svs_l1", "nominal", "turbo"; "svs_l1", "nominal", "turbo";
src-clock-name = "camnoc_rt_axi_clk_src"; src-clock-name = "camnoc_rt_axi_clk_src";