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

Commit 32828512 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: Add APC CPR configuration for MSM8996 speed-bin 2" into dev/msm-4.4-8996au

parents 62870561 a1c594e1

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

+338 −36
Original line number Diff line number Diff line
@@ -624,15 +624,18 @@ 


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

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

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

				qcom,cpr-speed-bins = <2>;

				qcom,cpr-speed-bin-corners = <16 13>;

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

				qcom,cpr-speed-bins = <3>;

				qcom,cpr-speed-bin-corners = <16 13 16>;

				qcom,cpr-corners =

					/* Speed bin 0 */

					<16 16 16 16 16 16 16 16>,



					/* Speed bin 1 */

					<13 13 13 13 13 13 13 13>;

					<13 13 13 13 13 13 13 13>,



					/* Speed bin 2 */

					<16 16 16 16 16 16 16 16>;



				qcom,ldo-min-headroom-voltage = <150000>;

				qcom,ldo-max-headroom-voltage = <470000>;
@@ -644,7 +647,10 @@ 
					<1 2 7 12 16>,



					/* Speed bin 1 */

					<1 2 7 12 13>;

					<1 2 7 12 13>,



					/* Speed bin 2 */

					<1 2 7 12 16>;



				qcom,cpr-voltage-ceiling =

					/* Speed bin 0 */
@@ -656,7 +662,13 @@ 
					/* Speed bin 1 */

					<670000  670000  745000  745000  745000

					 745000  745000  905000  905000  905000

					 905000  905000 1140000>;

					 905000  905000 1140000>,



					/* Speed bin 2 */

					<670000  670000  745000  745000  745000

					 745000  745000  905000  905000  905000

					 905000  905000 1140000 1140000 1140000

					1140000>;



				qcom,cpr-voltage-floor =

					/* Speed bin 0 */
@@ -717,7 +729,41 @@ 
					 470000  470000  470000>,

					<470000  470000  470000  470000  470000

					 470000  470000  470000  470000  470000

					 470000  470000  470000>;

					 470000  470000  470000>,



					/* Speed bin 2 */

					<625000  625000  625000  625000  625000

					 625000  625000  625000  625000  625000

					 625000  625000  625000  625000  625000

					 625000>,

					<625000  625000  625000  625000  625000

					 625000  625000  625000  625000  625000

					 625000  625000  625000  625000  625000

					 625000>,

					<625000  625000  625000  625000  625000

					 625000  625000  625000  625000  625000

					 625000  625000  625000  625000  625000

					 625000>,

					<625000  625000  625000  625000  625000

					 625000  625000  625000  625000  625000

					 625000  625000  625000  625000  625000

					 625000>,

					<625000  625000  625000  625000  625000

					 625000  625000  625000  625000  625000

					 625000  625000  625000  625000  625000

					 625000>,

					<625000  625000  625000  625000  625000

					 625000  625000  625000  625000  625000

					 625000  625000  625000  625000  625000

					 625000>,

					<470000  470000  470000  470000  470000

					 470000  470000  470000  470000  470000

					 470000  470000  470000  470000  470000

					 470000>,

					<470000  470000  470000  470000  470000

					 470000  470000  470000  470000  470000

					 470000  470000  470000  470000  470000

					 470000>;



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

					/* Speed bin 0 */
@@ -729,7 +775,13 @@ 
					/* Speed bin 1 */

					 <50000   50000   80000   80000   80000

					  80000   80000   80000   80000   80000

					  80000   80000   80000>;

					  80000   80000   80000>,



					/* Speed bin 2 */

					 <50000   50000   80000   80000   80000

					  80000   80000   80000   80000   80000

					  80000   80000   80000   80000   80000

					  80000>;



				qcom,corner-frequencies =

					/* Speed bin 0 */
@@ -745,7 +797,15 @@ 
					 556800000  652800000  729600000

					 844800000  960000000 1036800000

					1113600000 1190400000 1228800000

					1363200000>;

					1363200000>,



					/* Speed bin 2 */

					<307200000  422400000  480000000

					 556800000  652800000  729600000

					 844800000  960000000 1036800000

					1113600000 1190400000 1228800000

					1324800000 1401600000 1478400000

					1593600000>;



				qcom,cpr-ro-scaling-factor =

				      <   0    0 3112 2666 2947 2543 2271 1979
@@ -778,6 +838,16 @@ 
					<35000     0 40000  10000     5000>,

					<35000     0 40000  10000     5000>,

					<35000     0 40000  10000     5000>,

					<35000     0 40000  10000     5000>,



					/* Speed bin 2 */

					<20000     0 25000 (-5000) (-10000)>,

					<20000     0 25000 (-5000) (-10000)>,

					<20000     0 25000 (-5000) (-10000)>,

					<35000     0 40000  10000     5000>,

					<35000     0 40000  10000     5000>,

					<35000     0 40000  10000     5000>,

					<35000     0 40000  10000     5000>,

					<35000     0 40000  10000     5000>;



				qcom,cpr-closed-loop-voltage-fuse-adjustment =
@@ -799,6 +869,16 @@ 
					<20000 10000  5000 (-5000) (-5000)>,

					<20000 10000  5000 (-5000) (-5000)>,

					<20000 10000  5000 (-5000) (-5000)>,

					<20000 10000  5000 (-5000) (-5000)>,



					/* Speed bin 2 */

					<35000 35000 40000  40000   40000>,

					<20000 10000  5000 (-5000) (-5000)>,

					<20000 10000  5000 (-5000) (-5000)>,

					<20000 10000  5000 (-5000) (-5000)>,

					<20000 10000  5000 (-5000) (-5000)>,

					<20000 10000  5000 (-5000) (-5000)>,

					<20000 10000  5000 (-5000) (-5000)>,

					<20000 10000  5000 (-5000) (-5000)>;



				qcom,cpr-open-loop-voltage-adjustment =
@@ -812,14 +892,23 @@ 
					<(-15000) (-15000) (-15000) (-15000)

					 (-13000) (-14000) (-15000) (-18000)

					 (-20000) (-22000) (-24000) (-25000)

					 (-26000)>;

					 (-26000)>,



					/* Speed bin 2 */

					<(-15000) (-15000) (-15000) (-15000)

					 (-13000) (-14000) (-15000) (-18000)

					 (-20000) (-22000) (-24000) (-25000)

					 (-26000) (-27000) (-28000) (-30000)>;



				qcom,cpr-open-loop-voltage-min-diff =

					/* Speed bin 0 */

				       <0 0 0 0 (-50000) 0 0 0 0 0 0 0 0 0 0 0>,



					/* Speed bin 1 */

				       <0 0 0 0 (-50000) 0 0 0 0 0 0 0 0>;

				       <0 0 0 0 (-50000) 0 0 0 0 0 0 0 0>,



					/* Speed bin 2 */

				       <0 0 0 0 (-50000) 0 0 0 0 0 0 0 0 0 0 0>;



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

					/* Speed bin 0 */
@@ -832,20 +921,29 @@ 
					<(-15000) (-15000) (-15000) (-15000)

					 (-13000) (-14000) (-15000) (-18000)

					 (-20000) (-22000) (-24000) (-25000)

					 (-26000)>;

					 (-26000)>,



					/* Speed bin 2 */

					<(-15000) (-15000) (-15000) (-15000)

					 (-13000) (-14000) (-15000) (-18000)

					 (-20000) (-22000) (-24000) (-25000)

					 (-26000) (-27000) (-28000) (-30000)>;



				qcom,allow-voltage-interpolation;

				qcom,allow-quotient-interpolation;

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



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

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

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

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

				qcom,allow-aging-voltage-adjustment =

					/* Speed bin 0 */

					<0 0 0 1 1 1 1 1>,



					/* Speed bin 1 */

					<0 0 0 1 1 1 1 1>,



					/* Speed bin 2 */

					<0 0 0 1 1 1 1 1>;

			};
@@ -859,22 +957,28 @@ 


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

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

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

				qcom,cpr-speed-bins = <2>;

				qcom,cpr-speed-bin-corners = <19 15>;

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

				qcom,cpr-speed-bins = <3>;

				qcom,cpr-speed-bin-corners = <19 15 19>;

				qcom,cpr-corners =

					/* Speed bin 0 */

					<19 19 19 19 19 19 19 19>,



					/* Speed bin 1 */

					<15 15 15 15 15 15 15 15>;

					<15 15 15 15 15 15 15 15>,



					/* Speed bin 2 */

					<19 19 19 19 19 19 19 19>;



				qcom,cpr-corner-fmax-map =

					/* Speed bin 0 */

					<1 2 5 13 19>,



					/* Speed bin 1 */

					<1 2 5 13 15>;

					<1 2 5 13 15>,



					/* Speed bin 2 */

					<1 2 5 13 19>;



				qcom,cpr-voltage-ceiling =

				       /* Speed bin 0 */
@@ -886,7 +990,13 @@ 
				       /* Speed bin 1 */

				       <670000  670000  745000  745000  745000

					905000  905000  905000  905000  905000

					905000  905000  905000 1140000 1140000>;

					905000  905000  905000 1140000 1140000>,



				       /* Speed bin 2 */

				       <670000  670000  745000  745000  745000

					905000  905000  905000  905000  905000

					905000  905000  905000 1140000 1140000

				       1140000 1140000 1140000 1140000>;



				qcom,cpr-voltage-floor =

				       /* Speed bin 0 */
@@ -947,7 +1057,41 @@ 
					470000  470000  470000  470000  470000>,

				       <470000  470000  470000  470000  470000

					470000  470000  470000  470000  470000

					470000  470000  470000  470000  470000>;

					470000  470000  470000  470000  470000>,



				       /* Speed bin 2 */

				       <625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000

					625000  625000  625000  625000>,

				       <625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000

					625000  625000  625000  625000>,

				       <625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000

					625000  625000  625000  625000>,

				       <625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000

					625000  625000  625000  625000>,

				       <625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000

					625000  625000  625000  625000>,

				       <625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000

					625000  625000  625000  625000>,

				       <470000  470000  470000  470000  470000

					470000  470000  470000  470000  470000

					470000  470000  470000  470000  470000

					470000  470000  470000  470000>,

				       <470000  470000  470000  470000  470000

					470000  470000  470000  470000  470000

					470000  470000  470000  470000  470000

					470000  470000  470000  470000>;



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

					/* Speed bin 0 */
@@ -959,7 +1103,13 @@ 
					/* Speed bin 1 */

					<50000   50000   80000   80000   80000

					 80000   80000   80000   80000   80000

					 80000   80000   80000   80000   80000>;

					 80000   80000   80000   80000   80000>,



					/* Speed bin 2 */

					<50000   50000   80000   80000   80000

					 80000   80000   80000   80000   80000

					 80000   80000   80000   80000   80000

					 80000   80000   80000   80000>;



				qcom,corner-frequencies =

					/* Speed bin 0 */
@@ -976,7 +1126,16 @@ 
					 537600000  595200000  672000000

					 748800000  825600000  902400000

					 979200000 1056000000 1132800000

					1190400000 1228800000 1305600000>;

					1190400000 1228800000 1305600000>,



					/* Speed bin 2 */

					<307200000  384000000  460800000

					 537600000  595200000  672000000

					 748800000  825600000  902400000

					 979200000 1056000000 1132800000

					1190400000 1228800000 1305600000

					1382400000 1459200000 1536000000

					1593600000>;



				qcom,cpr-ro-scaling-factor =

				      <   0    0 3112 2666 2947 2543 2271 1979
@@ -1009,6 +1168,16 @@ 
					<45000    0    5000     5000  (-25000)>,

					<45000    0    5000     5000  (-25000)>,

					<45000    0    5000     5000  (-25000)>,

					<45000    0    5000     5000  (-25000)>,



					/* Speed bin 2 */

					<30000    0 (-10000) (-10000) (-40000)>,

					<30000    0 (-10000) (-10000) (-40000)>,

					<30000    0 (-10000) (-10000) (-40000)>,

					<45000    0    5000     5000  (-25000)>,

					<45000    0    5000     5000  (-25000)>,

					<45000    0    5000     5000  (-25000)>,

					<45000    0    5000     5000  (-25000)>,

					<45000    0    5000     5000  (-25000)>;



				qcom,cpr-closed-loop-voltage-fuse-adjustment =
@@ -1030,6 +1199,16 @@ 
					<10000 5000 (-20000)        0 (-35000)>,

					<10000 5000 (-20000)        0 (-35000)>,

					<10000 5000 (-20000)        0 (-35000)>,

					<10000 5000 (-20000)        0 (-35000)>,



					/* Speed bin 2 */

					<10000 5000        0        0        0>,

					<10000 5000 (-20000)        0 (-35000)>,

					<10000 5000 (-20000)        0 (-35000)>,

					<10000 5000 (-20000)        0 (-35000)>,

					<10000 5000 (-20000)        0 (-35000)>,

					<10000 5000 (-20000)        0 (-35000)>,

					<10000 5000 (-20000)        0 (-35000)>,

					<10000 5000 (-20000)        0 (-35000)>;



				qcom,allow-voltage-interpolation;
@@ -1037,13 +1216,16 @@ 
				qcom,cpr-scaled-open-loop-voltage-as-ceiling;



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

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

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

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

				qcom,allow-aging-voltage-adjustment =

					/* Speed bin 0 */

					<0 0 0 1 1 1 1 1>,



					/* Speed bin 1 */

					<0 0 0 1 1 1 1 1>,



					/* Speed bin 2 */

					<0 0 0 1 1 1 1 1>;

			};

		};
@@ -1062,15 +1244,18 @@ 


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

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

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

				qcom,cpr-speed-bins = <2>;

				qcom,cpr-speed-bin-corners = <25 21>;

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

				qcom,cpr-speed-bins = <3>;

				qcom,cpr-speed-bin-corners = <25 21 25>;

				qcom,cpr-corners =

					/* Speed bin 0 */

					<25 25 25 25 25 25 25 25>,



					/* Speed bin 1 */

					<21 21 21 21 21 21 21 21>;

					<21 21 21 21 21 21 21 21>,



					/* Speed bin 0 */

					<25 25 25 25 25 25 25 25>;



				qcom,ldo-min-headroom-voltage = <150000>;

				qcom,ldo-max-headroom-voltage = <470000>;
@@ -1082,7 +1267,10 @@ 
					<1 4 9 13 25>,



					/* Speed bin 1 */

					<1 4 9 13 21>;

					<1 4 9 13 21>,



					/* Speed bin 2 */

					<1 4 9 13 25>;



				qcom,cpr-voltage-ceiling =

				       /* Speed bin 0 */
@@ -1097,7 +1285,15 @@ 
					745000  745000  745000  745000  905000

					905000  905000  905000 1140000 1140000

				       1140000 1140000 1140000 1140000 1140000

				       1140000>;

				       1140000>,



				       /* Speed bin 2 */

				       <670000  670000  670000  670000  745000

					745000  745000  745000  745000  905000

					905000  905000  905000 1140000 1140000

				       1140000 1140000 1140000 1140000 1140000

				       1140000 1140000 1140000 1140000 1140000>;





				qcom,cpr-voltage-floor =

				       /* Speed bin 0 */
@@ -1182,7 +1378,49 @@ 
					470000  470000  470000  470000  470000

					470000  470000  470000  470000  470000

					470000  470000  470000  470000  470000

					470000>;

					470000>,



				       /* Speed bin 2 */

				       <625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000>,

				       <625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000>,

				       <625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000>,

				       <625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000>,

				       <625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000>,

				       <625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000

					625000  625000  625000  625000  625000>,

				       <470000  470000  470000  470000  470000

					470000  470000  470000  470000  470000

					470000  470000  470000  470000  470000

					470000  470000  470000  470000  470000

					470000  470000  470000  470000  470000>,

				       <470000  470000  470000  470000  470000

					470000  470000  470000  470000  470000

					470000  470000  470000  470000  470000

					470000  470000  470000  470000  470000

					470000  470000  470000  470000  470000>;



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

					/* Speed bin 0 */
@@ -1197,7 +1435,14 @@ 
					 80000   80000   80000   80000   80000

					 80000   80000   80000   80000   80000

					 80000   80000   80000   80000   80000

					 80000>;

					 80000>,



					/* Speed bin 2 */

					<50000   50000   50000   50000   80000

					 80000   80000   80000   80000   80000

					 80000   80000   80000   80000   80000

					 80000   80000   80000   80000   80000

					 80000   80000   80000   80000   80000>;



				qcom,corner-frequencies =

					/* Speed bin 0 */
@@ -1218,7 +1463,18 @@ 
					1036800000 1113600000 1190400000

					1248000000 1324800000 1401600000

					1478400000 1555200000 1632000000

					1708800000 1785600000 1804800000>;

					1708800000 1785600000 1804800000>,



					/* Speed bin 2 */

					<307200000  403200000  480000000

					 556800000  652800000  729600000

					 806400000  883200000  940800000

					1036800000 1113600000 1190400000

					1248000000 1324800000 1401600000

					1478400000 1555200000 1632000000

					1708800000 1785600000 1824000000

					1920000000 1996800000 2073600000

					2150400000>;



				qcom,cpr-ro-scaling-factor =

				      <   0    0 3112 2666 2947 2543 2271 1979
@@ -1251,6 +1507,16 @@ 
					<35000     0 30000   15000  15000>,

					<35000     0 30000   15000  15000>,

					<35000     0 30000   15000  15000>,

					<35000     0 30000   15000  15000>,



					/* Speed bin 2 */

					<20000     0 15000 (-55000)     0>,

					<20000     0 15000 (-55000)     0>,

					<20000     0 15000       0      0>,

					<35000     0 30000   15000  15000>,

					<35000     0 30000   15000  15000>,

					<35000     0 30000   15000  15000>,

					<35000     0 30000   15000  15000>,

					<35000     0 30000   15000  15000>;



				qcom,cpr-closed-loop-voltage-fuse-adjustment =
@@ -1272,6 +1538,16 @@ 
					<    0     0     0        0     0>,

					<    0     0     0        0     0>,

					<    0     0     0        0     0>,

					<    0     0     0        0     0>,



					/* Speed bin 2 */

					<35000 35000 40000 (-30000) 40000>,

					<    0     0     0 (-70000)     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-adjustment =
@@ -1290,7 +1566,17 @@ 
					 (-15000) (-18000) (-21000) (-23000)

					 (-25000) (-25000) (-26000) (-26000)

					 (-27000) (-27000) (-28000) (-28000)

					 (-28000)>;

					 (-28000)>,



					/* Speed bin 2 */

					<(-15000) (-15000) (-15000) (-15000)

					 (-11000) (-12000) (-13000) (-14000)

					 (-15000) (-18000) (-21000) (-23000)

					 (-25000) (-25000) (-26000) (-26000)

					 (-27000) (-27000) (-28000) (-28000)

					 (-28000) (-29000) (-29000) (-30000)

					 (-30000)>;



				qcom,cpr-open-loop-voltage-min-diff =

					/* Speed bin 0 */

					<0 0 0 0 (-50000) 0 0 0 0 0 0 0 0 0 0 0
@@ -1298,7 +1584,11 @@ 


					/* Speed bin 1 */

					<0 0 0 0 (-50000) 0 0 0 0 0 0 0 0 0 0 0

					 0 0 0 0 0>;

					 0 0 0 0 0>,



					/* Speed bin 2 */

					<0 0 0 0 (-50000) 0 0 0 0 0 0 0 0 0 0 0

					 0 0 0 0 0 0 0 0 0>;



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

					/* Speed bin 0 */
@@ -1316,20 +1606,32 @@ 
					 (-15000) (-18000) (-21000) (-23000)

					 (-25000) (-25000) (-26000) (-26000)

					 (-27000) (-27000) (-28000) (-28000)

					 (-28000)>;

					 (-28000)>,



					/* Speed bin 2 */

					<(-15000) (-15000) (-15000) (-15000)

					 (-11000) (-12000) (-13000) (-14000)

					 (-15000) (-18000) (-21000) (-23000)

					 (-25000) (-25000) (-26000) (-26000)

					 (-27000) (-27000) (-28000) (-28000)

					 (-28000) (-29000) (-29000) (-30000)

					 (-30000)>;



				qcom,allow-voltage-interpolation;

				qcom,allow-quotient-interpolation;

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



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

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

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

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

				qcom,allow-aging-voltage-adjustment =

					/* Speed bin 0 */

					<0 0 0 1 1 1 1 1>,



					/* Speed bin 1 */

					<0 0 0 1 1 1 1 1>,



					/* Speed bin 2 */

					<0 0 0 1 1 1 1 1>;



				qcom,cpr-dynamic-floor-corner = <1>;