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

Commit 5f478f56 authored by David Collins's avatar David Collins
Browse files

ARM: dts: msm: add VDD_GFX retention corner for msm8996 



Add a new lowest VDD_GFX CPR corner on msm8996 which corresponds
to the retention level of 400 mV.  Also update the GPU clock
frequency to corner mapping tables to account for the shifted
corner values.

Change-Id: If67f66b41d2fefafa0ba45addf9fbdf7aa3f81b2
Signed-off-by: default avatarDavid Collins <collinsd@codeaurora.org>
parent 30b1d728

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

+13 −9
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ 
			compatible = "qcom,qpnp-regulator";

			reg = <0x1700 0x100>;

			regulator-name = "pmi8994_s2";

			regulator-min-microvolt = <545000>;

			regulator-min-microvolt = <400000>;

			regulator-max-microvolt = <1015000>;

			qcom,enable-time = <500>;

		};
@@ -535,7 +535,7 @@ 
			compatible = "qcom,qpnp-regulator";

			reg = <0x1700 0x100>;

			regulator-name = "pm8004_s2";

			regulator-min-microvolt = <545000>;

			regulator-min-microvolt = <400000>;

			regulator-max-microvolt = <1015000>;

			qcom,enable-time = <500>;

			status = "disabled";
@@ -789,24 +789,26 @@ 
			gfx_vreg: regulator {

				regulator-name = "gfx_corner";

				regulator-min-microvolt = <1>;

				regulator-max-microvolt = <4>;

				regulator-max-microvolt = <5>;



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

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

				qcom,cpr-corners = <4>;

				qcom,cpr-corners = <5>;



				qcom,cpr-corner-fmax-map = <1 2 3 4>;

				qcom,cpr-corner-fmax-map = <2 3 4 5>;



				qcom,cpr-voltage-ceiling =

					<670000  745000  905000 1015000>;

					<400000 670000  745000  905000 1015000>;

				qcom,cpr-voltage-floor =

					<545000  625000  755000  855000>;

					<400000 545000  625000  755000  855000>;



				qcom,corner-frequencies =

					<120000000 205000000 360000000

					<0 120000000 205000000 360000000

					 480000000>;



				qcom,cpr-target-quotients =

				      <   0    0    0    0  249  232    0  394

					  0  422    0    0    0    0    0    0>,

				      <   0    0    0    0  249  232    0  394

					  0  422    0    0    0    0    0    0>,

				      <   0    0    0    0  400  363    0  565
@@ -823,13 +825,15 @@ 
					  0 2539    0    0    0    0    0    0>,

				      <   0    0    0    0 2268 2004    0 2408

					  0 2539    0    0    0    0    0    0>,

				      <   0    0    0    0 2268 2004    0 2408

					  0 2539    0    0    0    0    0    0>,

				      <   0    0    0    0 2268 2004    0 2408

					  0 2539    0    0    0    0    0    0>;



				qcom,cpr-open-loop-voltage-fuse-adjustment =

					<35000 0 0 0>;

				qcom,cpr-closed-loop-voltage-adjustment =

					<45000 0 0 0>;

					<0 45000 0 0 0>;



				qcom,allow-voltage-interpolation;

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

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

+5 −5
Original line number Diff line number Diff line
@@ -41,11 +41,11 @@ 
	compatible = "qcom,gpucc-8996-v2";

	qcom,gfxfreq-corner-v2 =

		<	   0  0  0 >,

		<  125000000  1  4 >,

		<  214000000  1  4 >,

		<  315000000  2  4 >,

		<  500000000  3  5 >,

		<  604800000  4  7 >;

		<  125000000  2  4 >,

		<  214000000  2  4 >,

		<  315000000  3  4 >,

		<  500000000  4  5 >,

		<  604800000  5  7 >;

};



&gdsc_gpu_gx {

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

+7 −7
Original line number Diff line number Diff line
@@ -839,12 +839,12 @@ 
		vdd_mx-supply = <&pm8994_s2_corner>;

		qcom,gfxfreq-corner-v0 =

			<	   0  0  0 >,

			<   19200000  1  4 >,

			<   60000000  1  4 >,

			<  120000000  1  4 >,

			<  205000000  2  4 >,

			<  360000000  3  5 >,

			<  480000000  4  7 >;

			<   19200000  2  4 >,

			<   60000000  2  4 >,

			<  120000000  2  4 >,

			<  205000000  3  4 >,

			<  360000000  4  5 >,

			<  480000000  5  7 >;

		#clock-cells = <1>;

	};
@@ -2859,7 +2859,7 @@ 


		qcom,vdd-gfx-rstr{

			qcom,vdd-rstr-reg = "vdd-gfx";

			qcom,levels = <3 4 4>; /* Nominal, Super Turbo, Super Turbo */

			qcom,levels = <4 5 5>; /* Nominal, Turbo, Turbo */

			qcom,min-level = <1>; /* No Request */

		};