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

Commit 790b25b3 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge c17cd237 on remote branch

Change-Id: Ia7b5a21986c08c8c1195927a65a71928b5df75a9
parents 26f8097b c17cd237
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -602,6 +602,7 @@
		clock-names-option =  "ife_dsp_clk";
		clocks-option = <&camcc CAM_CC_IFE_0_DSP_CLK>;
		clock-rates-option = <600000000>;
		qcom,cam-cx-ipeak = <&cx_ipeak_lm 3>;
		status = "ok";
	};

@@ -671,6 +672,7 @@
		clock-names-option =  "ife_dsp_clk";
		clocks-option = <&camcc CAM_CC_IFE_1_DSP_CLK>;
		clock-rates-option = <600000000>;
		qcom,cam-cx-ipeak = <&cx_ipeak_lm 3>;
		status = "ok";
	};

@@ -741,6 +743,7 @@
		clocks-option = <&camcc CAM_CC_IFE_2_DSP_CLK>;
		clock-rates-option = <600000000>;
		dsp-disabled;
		qcom,cam-cx-ipeak = <&cx_ipeak_lm 3>;
		status = "ok";
	};

@@ -801,6 +804,7 @@
			<600000000 0>;
		clock-cntl-level = "lowsvs", "svs", "svs_l1", "turbo";
		src-clock-name = "ife_clk_src";
		qcom,cam-cx-ipeak = <&cx_ipeak_lm 3>;
		status = "ok";
	};

@@ -882,6 +886,7 @@
			<0 0 0 0 600000000>;
		clock-cntl-level = "lowsvs", "svs",
			"svs_l1", "nominal", "turbo";
		qcom,cam-cx-ipeak = <&cx_ipeak_lm 3>;
		status = "ok";
	};

@@ -914,6 +919,7 @@
			<0 0 0 0 600000000>;
		clock-cntl-level = "lowsvs", "svs",
			"svs_l1", "nominal", "turbo";
		qcom,cam-cx-ipeak = <&cx_ipeak_lm 3>;
		status = "ok";
	};

@@ -1049,6 +1055,7 @@
			<0 0 0 80000000 0 0>;
		clock-cntl-level = "suspend", "lowsvs", "svs",
			"svs_l1", "nominal", "turbo";
		qcom,cam-cx-ipeak = <&cx_ipeak_lm 3>;
		qcom,msm-bus,name = "cam_ahb";
		qcom,msm-bus,num-cases = <7>;
		qcom,msm-bus,num-paths = <1>;