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

Commit 0ef0c37c authored by David Collins's avatar David Collins
Browse files

ARM: dts: msm: specify VDD_GFX CPR configurations for msm8996v3 



Specify the VDD_GFX CPR configurations which are used on
MSM8996v3 chips.  This consists of an expanded set of frequencies
supported and adjustments reset to 0 uV.  Also, target quotient
and RO scaling factor values must be set to 0 until final values
are determined via characterization.  Disable CPR closed-loop
operation since the target quotients are not available.

Override the new values in the MSM8996v2 device tree file so that
the CPR configurations of this chip revision remain unchanged.

Change-Id: Ifa94d70f39b41f752192158c91574829dd5d4c17
Signed-off-by: default avatarDavid Collins <collinsd@codeaurora.org>
parent 9dbe02c8

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

+41 −33
Original line number Diff line number Diff line
@@ -815,8 +815,6 @@ 


		system-supply = <&pm8994_s1_corner>;



		qcom,cpr-enable;



		thread@0 {

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

			qcom,cpr-consecutive-up = <0>;
@@ -827,55 +825,65 @@ 
			gfx_vreg: regulator {

				regulator-name = "gfx_corner";

				regulator-min-microvolt = <1>;

				regulator-max-microvolt = <5>;

				regulator-max-microvolt = <7>;



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

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

				qcom,cpr-corners = <5>;

				qcom,cpr-corners = <7>;



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

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



				qcom,cpr-voltage-ceiling =

					<400000 670000  745000  905000 1015000>;

					<400000  670000  745000  905000  905000

					1015000 1015000>;

				qcom,cpr-voltage-floor =

					<400000 520000  520000  520000  520000>;

					<400000  520000  520000  520000  520000

					 520000  520000>;



				qcom,system-voltage = <2 2 2 2 4>;

				qcom,system-voltage = <2 2 2 2 2 2 4>;



				qcom,corner-frequencies =

					<0 210000000 300000000 500000000

					 604800000>;

					<0 210000000 300000000 401800000

					 510000000 549000000 624000000>;



				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

					  0  603    0    0    0    0    0    0>,

				      <   0    0    0    0  669  601    0  851

					  0  905    0    0    0    0    0    0>,

				      <   0    0    0    0  899  806    0 1084

					  0 1149    0    0    0    0    0    0>;

				      <   0    0    0    0    0    0    0    0

					  0    0    0    0    0    0    0    0>,

				      <   0    0    0    0    0    0    0    0

					  0    0    0    0    0    0    0    0>,

				      <   0    0    0    0    0    0    0    0

					  0    0    0    0    0    0    0    0>,

				      <   0    0    0    0    0    0    0    0

					  0    0    0    0    0    0    0    0>,

				      <   0    0    0    0    0    0    0    0

					  0    0    0    0    0    0    0    0>,

				      <   0    0    0    0    0    0    0    0

					  0    0    0    0    0    0    0    0>,

				      <   0    0    0    0    0    0    0    0

					  0    0    0    0    0    0    0    0>;



				qcom,cpr-ro-scaling-factor =

				      <   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>,

				      <   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    0    0    0    0

					  0    0    0    0    0    0    0    0>,

				      <   0    0    0    0    0    0    0    0

					  0    0    0    0    0    0    0    0>,

				      <   0    0    0    0    0    0    0    0

					  0    0    0    0    0    0    0    0>,

				      <   0    0    0    0    0    0    0    0

					  0    0    0    0    0    0    0    0>,

				      <   0    0    0    0    0    0    0    0

					  0    0    0    0    0    0    0    0>,

				      <   0    0    0    0    0    0    0    0

					  0    0    0    0    0    0    0    0>,

				      <   0    0    0    0    0    0    0    0

					  0    0    0    0    0    0    0    0>;



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

					<0 (-5000) (-30000) (-115000)>;

					<0 0 0 0>;

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

					<0 0 0 (-10000) (-65000)>;

					<0 0 0 0 0 0 0>;

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

					<0 130000 40000 85000 85000>;

					<0 0 0 0 0 0 0>;



				qcom,allow-voltage-interpolation;

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

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

+56 −0
Original line number Diff line number Diff line
@@ -242,6 +242,62 @@ 
		<0 0 0 0 0>;

};



&gfx_cpr {

	qcom,cpr-enable;

};



&gfx_vreg {

	regulator-min-microvolt = <1>;

	regulator-max-microvolt = <5>;



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

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

	qcom,cpr-corners = <5>;



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



	qcom,cpr-voltage-ceiling =

		<400000 670000  745000  905000 1015000>;

	qcom,cpr-voltage-floor =

		<400000 520000  520000  520000  520000>;



	qcom,system-voltage = <2 2 2 2 4>;



	qcom,corner-frequencies =

		<0 210000000 300000000 500000000 604800000>;



	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    0  603    0    0    0

		  0    0    0>,

	      <   0    0    0    0  669  601    0  851    0  905    0    0    0

		  0    0    0>,

	      <   0    0    0    0  899  806    0 1084    0 1149    0    0    0

		  0    0    0>;



	qcom,cpr-ro-scaling-factor =

	      <   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>,

	      <   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 =

		<0 (-5000) (-30000) (-115000)>;

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

		<0 0 0 (-10000) (-65000)>;

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

		<0 130000 40000 85000 85000>;

};



/* GPU overrides */

&msm_gpu {

	/* Updated chip ID */