From 120ff46702109b5ed68c50836e3b78ad95d195d3 Mon Sep 17 00:00:00 2001
From: Osvaldo Banuelos <osvaldob@codeaurora.org>
Date: Wed, 12 Oct 2016 15:19:59 -0700
Subject: [PATCH] ARM: dts: msm: Enable VDD_APC CPR aging for msmcobalt v2

Enable VDD_APC CPR aging for msmcobalt v2 and define a CPR
closed-loop and open-loop voltage margin reduction of 15 mV
for CPR local rev 3 parts and greater to account for this
feature being enabled.

CRs-Fixed: 1081084
Change-Id: I50a3ca4e09c6cd6edeb5c15478989e19926c6576
Signed-off-by: Osvaldo Banuelos <osvaldob@codeaurora.org>
---
 arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi | 88 +++++++++++++-----------
 1 file changed, 46 insertions(+), 42 deletions(-)

diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi
index 586c88862877..17e2de07caf6 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi
+++ b/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi
@@ -422,40 +422,40 @@
 		<40000 24000 0 30000>,
 		<40000 24000 0 30000>,
 		<40000 24000 0 30000>,
-		<40000 24000 0 30000>,
-		<40000 24000 0 30000>,
-		<40000 24000 0 30000>,
-		<40000 24000 0 30000>,
-		<40000 24000 0 30000>,
+		<25000 9000 (-15000) 15000>,
+		<25000 9000 (-15000) 15000>,
+		<25000 9000 (-15000) 15000>,
+		<25000 9000 (-15000) 15000>,
+		<25000 9000 (-15000) 15000>,
 		/* Speed bin 1 */
 		<40000 24000 0 30000>,
 		<40000 24000 0 30000>,
 		<40000 24000 0 30000>,
-		<40000 24000 0 30000>,
-		<40000 24000 0 30000>,
-		<40000 24000 0 30000>,
-		<40000 24000 0 30000>,
-		<40000 24000 0 30000>;
+		<25000 9000 (-15000) 15000>,
+		<25000 9000 (-15000) 15000>,
+		<25000 9000 (-15000) 15000>,
+		<25000 9000 (-15000) 15000>,
+		<25000 9000 (-15000) 15000>;
 
 	qcom,cpr-closed-loop-voltage-fuse-adjustment =
 		/* Speed bin 0 */
 		<20000 26000 0 30000>,
 		<20000 26000 0 30000>,
 		<20000 26000 0 30000>,
-		<20000 26000 0 30000>,
-		<20000 26000 0 30000>,
-		<20000 26000 0 30000>,
-		<20000 26000 0 30000>,
-		<20000 26000 0 30000>,
+		<5000 11000 (-15000) 15000>,
+		<5000 11000 (-15000) 15000>,
+		<5000 11000 (-15000) 15000>,
+		<5000 11000 (-15000) 15000>,
+		<5000 11000 (-15000) 15000>,
 		/* Speed bin 1 */
 		<20000 26000 0 30000>,
 		<20000 26000 0 30000>,
 		<20000 26000 0 30000>,
-		<20000 26000 0 30000>,
-		<20000 26000 0 30000>,
-		<20000 26000 0 30000>,
-		<20000 26000 0 30000>,
-		<20000 26000 0 30000>;
+		<5000 11000 (-15000) 15000>,
+		<5000 11000 (-15000) 15000>,
+		<5000 11000 (-15000) 15000>,
+		<5000 11000 (-15000) 15000>,
+		<5000 11000 (-15000) 15000>;
 
 	qcom,allow-voltage-interpolation;
 	qcom,allow-quotient-interpolation;
@@ -463,7 +463,9 @@
 
 	qcom,cpr-aging-ref-corner = <22 22>;
 	qcom,cpr-aging-ro-scaling-factor = <1620>;
-	qcom,allow-aging-voltage-adjustment = <0>;
+	qcom,allow-aging-voltage-adjustment =
+		<0 0 0 1 1 1 1 1>,
+		<0 0 0 1 1 1 1 1>;
 };
 
 &apc1_cpr {
@@ -583,40 +585,40 @@
 		<8000 0 0 52000>,
 		<8000 0 0 52000>,
 		<8000 0 0 52000>,
-		<8000 0 0 52000>,
-		<8000 0 0 52000>,
-		<8000 0 0 52000>,
-		<8000 0 0 52000>,
-		<8000 0 0 52000>,
+		<(-7000) (-15000) (-15000) 37000>,
+		<(-7000) (-15000) (-15000) 37000>,
+		<(-7000) (-15000) (-15000) 37000>,
+		<(-7000) (-15000) (-15000) 37000>,
+		<(-7000) (-15000) (-15000) 37000>,
 		/* Speed bin 1 */
 		<8000 0 0 52000>,
 		<8000 0 0 52000>,
 		<8000 0 0 52000>,
-		<8000 0 0 52000>,
-		<8000 0 0 52000>,
-		<8000 0 0 52000>,
-		<8000 0 0 52000>,
-		<8000 0 0 52000>;
+		<(-7000) (-15000) (-15000) 37000>,
+		<(-7000) (-15000) (-15000) 37000>,
+		<(-7000) (-15000) (-15000) 37000>,
+		<(-7000) (-15000) (-15000) 37000>,
+		<(-7000) (-15000) (-15000) 37000>;
 
 	qcom,cpr-closed-loop-voltage-fuse-adjustment =
 		/* Speed bin 0 */
 		<0 0 0 50000>,
 		<0 0 0 50000>,
 		<0 0 0 50000>,
-		<0 0 0 50000>,
-		<0 0 0 50000>,
-		<0 0 0 50000>,
-		<0 0 0 50000>,
-		<0 0 0 50000>,
+		<(-15000) (-15000) (-15000) 35000>,
+		<(-15000) (-15000) (-15000) 35000>,
+		<(-15000) (-15000) (-15000) 35000>,
+		<(-15000) (-15000) (-15000) 35000>,
+		<(-15000) (-15000) (-15000) 35000>,
 		/* Speed bin 1 */
 		<0 0 0 50000>,
 		<0 0 0 50000>,
 		<0 0 0 50000>,
-		<0 0 0 50000>,
-		<0 0 0 50000>,
-		<0 0 0 50000>,
-		<0 0 0 50000>,
-		<0 0 0 50000>;
+		<(-15000) (-15000) (-15000) 35000>,
+		<(-15000) (-15000) (-15000) 35000>,
+		<(-15000) (-15000) (-15000) 35000>,
+		<(-15000) (-15000) (-15000) 35000>,
+		<(-15000) (-15000) (-15000) 35000>;
 
 	qcom,allow-voltage-interpolation;
 	qcom,allow-quotient-interpolation;
@@ -624,7 +626,9 @@
 
 	qcom,cpr-aging-ref-corner = <30 26>;
 	qcom,cpr-aging-ro-scaling-factor = <1700>;
-	qcom,allow-aging-voltage-adjustment = <0>;
+	qcom,allow-aging-voltage-adjustment =
+		<0 0 0 1 1 1 1 1>,
+		<0 0 0 1 1 1 1 1>;
 };
 
 &pm8005_s1 {