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

Commit ad9fe5a4 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: enable VDD_GFX CPR aging adjustments for msm8996v3"

parents 64a95927 aabd2fc2

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

+28 −0
Original line number Diff line number Diff line
@@ -585,6 +585,8 @@ 
		qcom,cpr-enable;

		qcom,cpr-clock-throttling = <0x20>;



		qcom,cpr-aging-ref-voltage = <905000>;



		thread@0 {

			qcom,cpr-thread-id = <0>;

			qcom,cpr-consecutive-up = <0>;
@@ -679,6 +681,12 @@ 
				qcom,allow-voltage-interpolation;

				qcom,allow-quotient-interpolation;

				qcom,cpr-scaled-open-loop-voltage-as-ceiling;



				qcom,cpr-aging-max-voltage-adjustment = <25000>;

				qcom,cpr-aging-ref-corner = <12>;

				qcom,cpr-aging-ro-scaling-factor = <3200>;

				qcom,allow-aging-voltage-adjustment =

					<0 0 0 1 1 1 1 1>;

			};



			apc0_cbf_vreg: regulator-cbf {
@@ -752,6 +760,12 @@ 
				qcom,allow-voltage-interpolation;

				qcom,allow-quotient-interpolation;

				qcom,cpr-scaled-open-loop-voltage-as-ceiling;



				qcom,cpr-aging-max-voltage-adjustment = <25000>;

				qcom,cpr-aging-ref-corner = <13>;

				qcom,cpr-aging-ro-scaling-factor = <3200>;

				qcom,allow-aging-voltage-adjustment =

					<0 0 0 1 1 1 1 1>;

			};

		};
@@ -862,6 +876,12 @@ 
				qcom,allow-voltage-interpolation;

				qcom,allow-quotient-interpolation;

				qcom,cpr-scaled-open-loop-voltage-as-ceiling;



				qcom,cpr-aging-max-voltage-adjustment = <25000>;

				qcom,cpr-aging-ref-corner = <13>;

				qcom,cpr-aging-ro-scaling-factor = <3200>;

				qcom,allow-aging-voltage-adjustment =

					<0 0 0 1 1 1 1 1>;

			};

		};

	};
@@ -890,6 +910,8 @@ 


		qcom,cpr-enable;



		qcom,cpr-aging-ref-voltage = <905000>;



		thread@0 {

			qcom,cpr-thread-id = <0>;

			qcom,cpr-consecutive-up = <0>;
@@ -988,6 +1010,12 @@ 


				qcom,allow-voltage-interpolation;

				qcom,cpr-scaled-open-loop-voltage-as-ceiling;



				qcom,cpr-aging-max-voltage-adjustment = <25000>;

				qcom,cpr-aging-ref-corner = <6>;

				qcom,cpr-aging-ro-scaling-factor = <2950>;

				qcom,allow-aging-voltage-adjustment =

					<0 0 0 1 1 1 1 1>;

			};

		};

	};

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

+24 −0
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ 
	qcom,cpr-enable;

	qcom,cpr-hw-closed-loop;



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



	thread@0 {

		qcom,cpr-consecutive-down = <2>;

		qcom,cpr-up-threshold = <0>;
@@ -152,6 +154,11 @@ 
	/delete-property/ qcom,cpr-open-loop-voltage-adjustment;

	/delete-property/ qcom,cpr-open-loop-voltage-min-diff;

	/delete-property/ qcom,cpr-closed-loop-voltage-adjustment;



	/delete-property/ qcom,cpr-aging-max-voltage-adjustment;

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

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

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

};



&apc0_cbf_vreg {
@@ -200,6 +207,11 @@ 
		<0 0 0 0 0>,

		<0 0 0 0 (-115000)>,

		<0 0 0 0 (-115000)>;



	/delete-property/ qcom,cpr-aging-max-voltage-adjustment;

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

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

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

};



&apc1_vreg {
@@ -260,11 +272,18 @@ 
	/delete-property/ qcom,cpr-open-loop-voltage-adjustment;

	/delete-property/ qcom,cpr-open-loop-voltage-min-diff;

	/delete-property/ qcom,cpr-closed-loop-voltage-adjustment;



	/delete-property/ qcom,cpr-aging-max-voltage-adjustment;

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

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

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

};



&gfx_cpr {

	system-supply = <&pm8994_s1_corner>;

	qcom,cpr-enable;



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

};



&gfx_vreg {
@@ -317,6 +336,11 @@ 
		<0 0 0 (-10000) (-65000)>;

	qcom,cpr-floor-to-ceiling-max-range =

		<0 130000 40000 85000 85000>;



	/delete-property/ qcom,cpr-aging-max-voltage-adjustment;

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

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

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

};



&kryo0_vreg {

arch/arm/boot/dts/qcom/msm8996-v3.0.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
&gfx_cpr {

	system-supply = <&pm8994_s1_corner>;

	qcom,cpr-enable;



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

};



&gfx_vreg {
@@ -104,6 +106,11 @@ 


	qcom,allow-voltage-interpolation;

	qcom,cpr-scaled-open-loop-voltage-as-ceiling;



	/delete-property/ qcom,cpr-aging-max-voltage-adjustment;

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

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

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

};



&clock_gpu {