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

Commit 409af4b4 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: enable cx-ipeak for camera on trinket"

parents 543576b0 c895d8a6
Loading
Loading
Loading
Loading
+3 −3
Original line number Original line Diff line number Diff line
@@ -320,7 +320,7 @@
			<106 512 0 0>,
			<106 512 0 0>,
			<106 512 0 0>;
			<106 512 0 0>;
		qcom,msm-bus-vector-dyn-vote;
		qcom,msm-bus-vector-dyn-vote;
		/*qcom,cpp-cx-ipeak = <&cx_ipeak_lm 7>;*/
		qcom,cpp-cx-ipeak = <&cx_ipeak_lm 7>;
		resets = <&clock_gcc GCC_CAMSS_MICRO_BCR>;
		resets = <&clock_gcc GCC_CAMSS_MICRO_BCR>;
		reset-names = "micro_iface_reset";
		reset-names = "micro_iface_reset";
		qcom,src-clock-rates = <120000000 256000000 384000000
		qcom,src-clock-rates = <120000000 256000000 384000000
@@ -501,7 +501,7 @@
			<29 512 0 0>,
			<29 512 0 0>,
			<29 512 100000000 100000000>;
			<29 512 100000000 100000000>;
		qcom,msm-bus-vector-dyn-vote;
		qcom,msm-bus-vector-dyn-vote;
	/*	qcom,vfe-cx-ipeak = <&cx_ipeak_lm 7>;*/
		qcom,vfe-cx-ipeak = <&cx_ipeak_lm 7>;
	};
	};


	vfe1: qcom,vfe1@5c14000 {
	vfe1: qcom,vfe1@5c14000 {
@@ -579,7 +579,7 @@
			<29 512 0 0>,
			<29 512 0 0>,
			<29 512 100000000 100000000>;
			<29 512 100000000 100000000>;
		qcom,msm-bus-vector-dyn-vote;
		qcom,msm-bus-vector-dyn-vote;
	/*	qcom,vfe-cx-ipeak = <&cx_ipeak_lm 7>;*/
		qcom,vfe-cx-ipeak = <&cx_ipeak_lm 7>;
	};
	};


	qcom,vfe {
	qcom,vfe {