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

Commit d0deb260 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: disable VDD_APC0/1 CPR aging adjustments on MSM8998v2"

parents 5e640bc0 e2560029

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

+68 −76
Original line number Diff line number Diff line
@@ -515,37 +515,37 @@ 
		<40000  24000   12000  30000>,

		<40000  24000   12000  30000>,

		<40000  24000   12000  30000>,

		<25000   9000  (-3000) 15000>,

		<25000   9000  (-3000) 15000>,

		<25000   9000  (-3000) 15000>,

		<25000   9000  (-3000) 15000>,

		<40000  24000   12000  30000>,

		<40000  24000   12000  30000>,

		<40000  24000   12000  30000>,

		<40000  24000   12000  30000>,

		/* Speed bin 1 */

		<40000  24000   12000  30000>,

		<40000  24000   12000  30000>,

		<40000  24000   12000  30000>,

		<40000  24000   12000  30000>,

		<25000   9000  (-3000) 15000>,

		<25000   9000  (-3000) 15000>,

		<25000   9000  (-3000) 15000>,

		<25000   9000  (-3000) 15000>,

		<40000  24000   12000  30000>,

		<40000  24000   12000  30000>,

		<40000  24000   12000  30000>,

		<40000  24000   12000  30000>,

		/* Speed bin 2 */

		<40000  24000   12000  30000>,

		<40000  24000   12000  30000>,

		<40000  24000   12000  30000>,

		<40000  24000   12000  30000>,

		<25000   9000  (-3000) 15000>,

		<25000   9000  (-3000) 15000>,

		<25000   9000  (-3000) 15000>,

		<25000   9000  (-3000) 15000>,

		<40000  24000   12000  30000>,

		<40000  24000   12000  30000>,

		<40000  24000   12000  30000>,

		<40000  24000   12000  30000>,

		/* Speed bin 3 */

		<40000  24000   12000  30000>,

		<40000  24000   12000  30000>,

		<40000  24000   12000  30000>,

		<40000  24000   12000  30000>,

		<25000   9000  (-3000) 15000>,

		<25000   9000  (-3000) 15000>,

		<25000   9000  (-3000) 15000>,

		<25000   9000  (-3000) 15000>;

		<40000  24000   12000  30000>,

		<40000  24000   12000  30000>,

		<40000  24000   12000  30000>,

		<40000  24000   12000  30000>;



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

		/* Speed bin 0 */
@@ -553,37 +553,37 @@ 
		<20000  26000   12000  30000>,

		<20000  26000   12000  30000>,

		<20000  26000   12000  30000>,

		< 5000  11000  (-3000) 15000>,

		< 5000  11000  (-3000) 15000>,

		< 5000  11000  (-3000) 15000>,

		< 5000  11000  (-3000) 15000>,

		<20000  26000   12000  30000>,

		<20000  26000   12000  30000>,

		<20000  26000   12000  30000>,

		<20000  26000   12000  30000>,

		/* Speed bin 1 */

		<20000  26000   12000  30000>,

		<20000  26000   12000  30000>,

		<20000  26000   12000  30000>,

		<20000  26000   12000  30000>,

		< 5000  11000  (-3000) 15000>,

		< 5000  11000  (-3000) 15000>,

		< 5000  11000  (-3000) 15000>,

		< 5000  11000  (-3000) 15000>,

		<20000  26000   12000  30000>,

		<20000  26000   12000  30000>,

		<20000  26000   12000  30000>,

		<20000  26000   12000  30000>,

		/* Speed bin 2 */

		<20000  26000   12000  30000>,

		<20000  26000   12000  30000>,

		<20000  26000   12000  30000>,

		<20000  26000   12000  30000>,

		< 5000  11000  (-3000) 15000>,

		< 5000  11000  (-3000) 15000>,

		< 5000  11000  (-3000) 15000>,

		< 5000  11000  (-3000) 15000>,

		<20000  26000   12000  30000>,

		<20000  26000   12000  30000>,

		<20000  26000   12000  30000>,

		<20000  26000   12000  30000>,

		/* Speed bin 3 */

		<20000  26000   12000  30000>,

		<20000  26000   12000  30000>,

		<20000  26000   12000  30000>,

		<20000  26000   12000  30000>,

		< 5000  11000  (-3000) 15000>,

		< 5000  11000  (-3000) 15000>,

		< 5000  11000  (-3000) 15000>,

		< 5000  11000  (-3000) 15000>;

		<20000  26000   12000  30000>,

		<20000  26000   12000  30000>,

		<20000  26000   12000  30000>,

		<20000  26000   12000  30000>;



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

		/* Speed bin 0 */
@@ -643,11 +643,7 @@ 


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

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

	qcom,allow-aging-voltage-adjustment =

		<0 0 0 0 1 1 1 1>,

		<0 0 0 0 1 1 1 1>,

		<0 0 0 0 1 1 1 1>,

		<0 0 0 0 1 1 1 1>;

	qcom,allow-aging-voltage-adjustment = <0>;

};



&apc1_cpr {
@@ -854,37 +850,37 @@ 
		<  8000        0   12000  52000>,

		<  8000        0   12000  52000>,

		<  8000        0   12000  52000>,

		<(-7000) (-15000) (-3000) 37000>,

		<(-7000) (-15000) (-3000) 37000>,

		<(-7000) (-15000) (-3000) 37000>,

		<(-7000) (-15000) (-3000) 37000>,

		<  8000        0   12000  52000>,

		<  8000        0   12000  52000>,

		<  8000        0   12000  52000>,

		<  8000        0   12000  52000>,

		/* Speed bin 1 */

		<  8000        0   12000  52000>,

		<  8000        0   12000  52000>,

		<  8000        0   12000  52000>,

		<  8000        0   12000  52000>,

		<(-7000) (-15000) (-3000) 37000>,

		<(-7000) (-15000) (-3000) 37000>,

		<(-7000) (-15000) (-3000) 37000>,

		<(-7000) (-15000) (-3000) 37000>,

		<  8000        0   12000  52000>,

		<  8000        0   12000  52000>,

		<  8000        0   12000  52000>,

		<  8000        0   12000  52000>,

		/* Speed bin 2 */

		<  8000        0   12000  52000>,

		<  8000        0   12000  52000>,

		<  8000        0   12000  52000>,

		<  8000        0   12000  52000>,

		<(-7000) (-15000) (-3000) 37000>,

		<(-7000) (-15000) (-3000) 37000>,

		<(-7000) (-15000) (-3000) 37000>,

		<(-7000) (-15000) (-3000) 37000>,

		<  8000        0   12000  52000>,

		<  8000        0   12000  52000>,

		<  8000        0   12000  52000>,

		<  8000        0   12000  52000>,

		/* Speed bin 3 */

		<  8000        0   12000  52000>,

		<  8000        0   12000  52000>,

		<  8000        0   12000  52000>,

		<  8000        0   12000  52000>,

		<(-7000) (-15000) (-3000) 37000>,

		<(-7000) (-15000) (-3000) 37000>,

		<(-7000) (-15000) (-3000) 37000>,

		<(-7000) (-15000) (-3000) 37000>;

		<  8000        0   12000  52000>,

		<  8000        0   12000  52000>,

		<  8000        0   12000  52000>,

		<  8000        0   12000  52000>;



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

		/* Speed bin 0 */
@@ -892,37 +888,37 @@ 
		<      0        0   12000  50000>,

		<      0        0   12000  50000>,

		<      0        0   12000  50000>,

		<(-15000) (-15000) (-3000) 35000>,

		<(-15000) (-15000) (-3000) 35000>,

		<(-15000) (-15000) (-3000) 35000>,

		<(-15000) (-15000) (-3000) 35000>,

		<      0        0   12000  50000>,

		<      0        0   12000  50000>,

		<      0        0   12000  50000>,

		<      0        0   12000  50000>,

		/* Speed bin 1 */

		<      0        0   12000  50000>,

		<      0        0   12000  50000>,

		<      0        0   12000  50000>,

		<      0        0   12000  50000>,

		<(-15000) (-15000) (-3000) 35000>,

		<(-15000) (-15000) (-3000) 35000>,

		<(-15000) (-15000) (-3000) 35000>,

		<(-15000) (-15000) (-3000) 35000>,

		/* Speed bin 0 */

		<      0        0   12000  50000>,

		<      0        0   12000  50000>,

		<      0        0   12000  50000>,

		<      0        0   12000  50000>,

		<(-15000) (-15000) (-3000) 35000>,

		<(-15000) (-15000) (-3000) 35000>,

		<(-15000) (-15000) (-3000) 35000>,

		<(-15000) (-15000) (-3000) 35000>,

		/* Speed bin 1 */

		/* Speed bin 2 */

		<      0        0   12000  50000>,

		<      0        0   12000  50000>,

		<      0        0   12000  50000>,

		<      0        0   12000  50000>,

		<      0        0   12000  50000>,

		<      0        0   12000  50000>,

		<      0        0   12000  50000>,

		<      0        0   12000  50000>,

		/* Speed bin 3 */

		<      0        0   12000  50000>,

		<      0        0   12000  50000>,

		<      0        0   12000  50000>,

		<      0        0   12000  50000>,

		<(-15000) (-15000) (-3000) 35000>,

		<(-15000) (-15000) (-3000) 35000>,

		<(-15000) (-15000) (-3000) 35000>,

		<(-15000) (-15000) (-3000) 35000>;

		<      0        0   12000  50000>,

		<      0        0   12000  50000>,

		<      0        0   12000  50000>,

		<      0        0   12000  50000>;



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

		/* Speed bin 0 */
@@ -994,11 +990,7 @@ 


	qcom,cpr-aging-ref-corner = <32 26 30 31>;

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

	qcom,allow-aging-voltage-adjustment =

		<0 0 0 0 1 1 1 1>,

		<0 0 0 0 1 1 1 1>,

		<0 0 0 0 1 1 1 1>,

		<0 0 0 0 1 1 1 1>;

	qcom,allow-aging-voltage-adjustment = <0>;

};



&pm8005_s1 {