Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cc1357c authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add GCC throttle clock for Shima" into camera-kernel.lnx.4.0

parents d90d4a5e f7b54dbe

shima-camera.dtsi

+15 −6
Original line number Diff line number Diff line
@@ -1323,10 +1323,17 @@ 
		camnoc-axi-min-ib-bw = <3000000000>;

		regulator-names = "camss-vdd";

		camss-vdd-supply = <&cam_cc_titan_top_gdsc>;

		/*

		 * GCC throttle rt/nrt clock is added as a workaround in shima.

		 * Normally, This clock should be turned on/off along with

		 * GCC HF/SF clock

		 */

		clock-names =

			"gcc_ahb_clk",

			"gcc_axi_hf_clk",

			"gcc_axi_sf_clk",

			"gcc_rt_throttle_clk",

			"gcc_nrt_throttle_clk",

			"slow_ahb_clk_src",

			"cpas_ahb_clk",

			"cpas_core_ahb_clk",
@@ -1336,6 +1343,8 @@ 
			<&gcc GCC_CAMERA_AHB_CLK>,

			<&gcc GCC_CAMERA_HF_AXI_CLK>,

			<&gcc GCC_CAMERA_SF_AXI_CLK>,

			<&gcc GCC_TITAN_RT_THROTTLE_CORE_CLK>,

			<&gcc GCC_TITAN_NRT_THROTTLE_CORE_CLK>,

			<&camcc CAM_CC_SLOW_AHB_CLK_SRC>,

			<&camcc CAM_CC_CPAS_AHB_CLK>,

			<&camcc CAM_CC_CORE_AHB_CLK>,
@@ -1343,12 +1352,12 @@ 
			<&camcc CAM_CC_CAMNOC_AXI_CLK>;

		src-clock-name = "camnoc_axi_clk_src";

		clock-rates =

			<0 0 0 0 0 0 0 0>,

			<0 0 0 80000000 0 0 300000000 0>,

			<0 0 0 80000000 0 0 300000000 0>,

			<0 0 0 80000000 0 0 342855555 0>,

			<0 0 0 80000000 0 0 400000000 0>,

			<0 0 0 80000000 0 0 400000000 0>;

			<0 0 0 0 0 0 0 0 0 0>,

			<0 0 0 0 0 80000000 0 0 300000000 0>,

			<0 0 0 0 0 80000000 0 0 300000000 0>,

			<0 0 0 0 0 80000000 0 0 342855555 0>,

			<0 0 0 0 0 80000000 0 0 400000000 0>,

			<0 0 0 0 0 80000000 0 0 400000000 0>;

		clock-cntl-level = "suspend", "lowsvs", "svs", "svs_l1",

			"nominal", "turbo";

		control-camnoc-axi-clk;