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

Commit 0cae1167 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: allow a VDD_APCC CPR aging measurement at boot on msm8996v3"

parents b5f558bf 5d6408ea

arch/arm/boot/dts/qcom/msm8996-regulator.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -588,6 +588,7 @@ 
		vdd-thread1-ldo-supply = <&kryo1_vreg>;

		vdd-thread0-ldo-ret-supply = <&kryo0_retention_vreg>;

		vdd-thread1-ldo-ret-supply = <&kryo1_retention_vreg>;

		proxy-supply = <&apc0_cbf_vreg>;



		qcom,cpr-enable;

		qcom,cpr-clock-throttling = <0x20>;
@@ -789,6 +790,9 @@ 
				regulator-min-microvolt = <1>;

				regulator-max-microvolt = <19>;



				qcom,proxy-consumer-enable;

				qcom,proxy-consumer-voltage = <13 19>;



				qcom,cpr-pd-bypass-mask = <0x18>;

				qcom,cpr-fuse-corners = <5>;

				qcom,cpr-fuse-combos = <16>;

arch/arm/boot/dts/qcom/msm8996-v2.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ 
	qcom,cpr-hw-closed-loop;



	/delete-property/ qcom,cpr-aging-ref-voltage;

	/delete-property/ proxy-supply;



	thread@0 {

		qcom,cpr-consecutive-down = <2>;
@@ -220,6 +221,8 @@ 
	/delete-property/ qcom,cpr-aging-ref-corner;

	/delete-property/ qcom,cpr-aging-ro-scaling-factor;

	/delete-property/ qcom,allow-aging-voltage-adjustment;

	/delete-property/ qcom,proxy-consumer-enable;

	/delete-property/ qcom,proxy-consumer-voltage;

};



&apc1_vreg {