ARM: dts: msm: add VDD_APC CPR speed-bin 1 configuration for msmcobalt v2

Add the VDD_APC CPR corner configuration corresponding to
speed-bin 1 parts whose performance cluster can operate
at a slower maximum clock rate compared to speed-bin 0 parts.

CRs-Fixed: 1057119
Change-Id: I01e2c9c8bafbb2be4c8d312a4212195c2a99f3ac
Signed-off-by: Osvaldo Banuelos <osvaldob@codeaurora.org>

1 files changed, 141 insertions, 7 deletions

diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi
index d5e2075c4add..52c80460d26a 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi
+++ b/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi
@@ -226,10 +226,30 @@
 
 &apc0_pwrcl_vreg {
 	regulator-max-microvolt = <23>;
-	qcom,cpr-corners = <22>;
-	qcom,cpr-corner-fmax-map = <8 11 18 22>;
+
+	qcom,cpr-fuse-combos = <16>;
+	qcom,cpr-speed-bins = <2>;
+	qcom,cpr-speed-bin-corners = <22 22>;
+	qcom,cpr-corners =
+		/* Speed bin 0 */
+		<22 22 22 22 22 22 22 22>,
+		/* Speed bin 1 */
+		<22 22 22 22 22 22 22 22>;
+
+	qcom,cpr-corner-fmax-map =
+		/* Speed bin 0 */
+		<8 11 18 22>,
+		/* Speed bin 1 */
+		<8 11 18 22>;
 
 	qcom,cpr-voltage-ceiling =
+		/* Speed bin 0 */
+		<688000  688000  688000  688000  688000
+		 688000  688000  688000  756000  756000
+		 756000  828000  828000  828000  828000
+		 828000  828000  828000  952000  952000
+		1056000 1056000>,
+		/* Speed bin 1 */
 		<688000  688000  688000  688000  688000
 		 688000  688000  688000  756000  756000
 		 756000  828000  828000  828000  828000
@@ -237,6 +257,13 @@
 		1056000 1056000>;
 
 	qcom,cpr-voltage-floor =
+		/* Speed bin 0 */
+		<568000  568000  568000  568000  568000
+		 568000  568000  568000  568000  568000
+		 568000  632000  632000  632000  632000
+		 632000  632000  632000  712000  712000
+		 772000  772000>,
+		/* Speed bin 1 */
 		<568000  568000  568000  568000  568000
 		 568000  568000  568000  568000  568000
 		 568000  632000  632000  632000  632000
@@ -244,6 +271,14 @@
 		 772000  772000>;
 
 	qcom,cpr-floor-to-ceiling-max-range =
+		/* Speed bin 0 */
+		<55000  55000  55000  55000
+		 55000  55000  55000  55000
+		 55000  55000  55000  65000
+		 65000  65000  65000  65000
+		 65000  65000  65000  65000
+		 65000  65000>,
+		/* Speed bin 1 */
 		<55000  55000  55000  55000
 		 55000  55000  55000  55000
 		 55000  55000  55000  65000
@@ -252,6 +287,16 @@
 		 65000  65000>;
 
 	qcom,corner-frequencies =
+		/* Speed bin 0 */
+		<300000000  364800000  441600000
+		 518400000  595200000  672000000
+		 748800000  825600000  883200000
+		 960000000 1036800000 1094400000
+		1171200000 1248000000 1324800000
+		1401600000 1478400000 1555200000
+		1670400000 1747200000 1824000000
+		1900800000>,
+		/* Speed bin 1 */
 		<300000000  364800000  441600000
 		 518400000  595200000  672000000
 		 748800000  825600000  883200000
@@ -276,6 +321,16 @@
 		 1559 1392>;
 
 	qcom,cpr-open-loop-voltage-fuse-adjustment =
+		/* Speed bin 0 */
+		<40000 24000 0 0>,
+		<40000 24000 0 0>,
+		<40000 24000 0 0>,
+		<40000 24000 0 0>,
+		<40000 24000 0 0>,
+		<40000 24000 0 0>,
+		<40000 24000 0 0>,
+		<40000 24000 0 0>,
+		/* Speed bin 1 */
 		<40000 24000 0 0>,
 		<40000 24000 0 0>,
 		<40000 24000 0 0>,
@@ -286,6 +341,16 @@
 		<40000 24000 0 0>;
 
 	qcom,cpr-closed-loop-voltage-fuse-adjustment =
+		/* Speed bin 0 */
+		<20000 26000 0 0>,
+		<20000 26000 0 0>,
+		<20000 26000 0 0>,
+		<20000 26000 0 0>,
+		<20000 26000 0 0>,
+		<20000 26000 0 0>,
+		<20000 26000 0 0>,
+		<20000 26000 0 0>,
+		/* Speed bin 1 */
 		<20000 26000 0 0>,
 		<20000 26000 0 0>,
 		<20000 26000 0 0>,
@@ -306,26 +371,56 @@
 
 &apc1_perfcl_vreg {
 	regulator-max-microvolt = <31>;
-	qcom,cpr-corners = <30>;
-	qcom,cpr-corner-fmax-map = <8 12 20 30>;
+
+	qcom,cpr-fuse-combos = <16>;
+	qcom,cpr-speed-bins = <2>;
+	qcom,cpr-speed-bin-corners = <30 26>;
+	qcom,cpr-corners =
+		/* Speed bin 0 */
+		<30 30 30 30 30 30 30 30>,
+		/* Speed bin 1 */
+		<26 26 26 26 26 26 26 26>;
+
+	qcom,cpr-corner-fmax-map =
+		/* Speed bin 0 */
+		<8 12 20 30>,
+		/* Speed bin 1 */
+		<8 12 20 26>;
 
 	qcom,cpr-voltage-ceiling =
+		/* Speed bin 0 */
+		<688000  688000  688000  688000  688000
+		 688000  688000  688000  756000  756000
+		 756000  756000  828000  828000  828000
+		 828000  828000  828000  828000  828000
+		 952000  952000  952000 1056000 1056000
+		1056000 1056000 1056000 1056000 1056000>,
+		/* Speed bin 1 */
 		<688000  688000  688000  688000  688000
 		 688000  688000  688000  756000  756000
 		 756000  756000  828000  828000  828000
 		 828000  828000  828000  828000  828000
 		 952000  952000  952000 1056000 1056000
-		1056000 1056000 1056000 1056000 1056000>;
+		1056000>;
 
 	qcom,cpr-voltage-floor =
+		/* Speed bin 0 */
+		<568000  568000  568000  568000  568000
+		 568000  568000  568000  568000  568000
+		 568000  568000  632000  632000  632000
+		 632000  632000  632000  632000  632000
+		 712000  712000  712000  772000  772000
+		 772000  772000  772000  772000  772000>,
+		/* Speed bin 1 */
 		<568000  568000  568000  568000  568000
 		 568000  568000  568000  568000  568000
 		 568000  568000  632000  632000  632000
 		 632000  632000  632000  632000  632000
 		 712000  712000  712000  772000  772000
-		 772000  772000  772000  772000  772000>;
+		 772000>;
 
 	qcom,cpr-floor-to-ceiling-max-range =
+		/* Speed bin 0 */
 		<55000  55000  55000  55000
 		 55000  55000  55000  55000
 		 55000  55000  55000  55000
@@ -333,9 +428,18 @@
 		 65000  65000  65000  65000
 		 65000  65000  65000  65000
 		 65000  65000  65000  65000
+		 65000  65000>,
+		/* Speed bin 1 */
+		<55000  55000  55000  55000
+		 55000  55000  55000  55000
+		 55000  55000  55000  55000
+		 65000  65000  65000  65000
+		 65000  65000  65000  65000
+		 65000  65000  65000  65000
 		 65000  65000>;
 
 	qcom,corner-frequencies =
+		/* Speed bin 0 */
 		<300000000  345600000  422400000
 		 499200000  576000000  652800000
 		 729600000  806400000  902400000
@@ -345,7 +449,17 @@
 		1651200000 1728000000 1804800000
 		1881600000 1958400000 2035200000
 		2112000000 2188800000 2265600000
-		2342400000 2419200000 2496000000>;
+		2342400000 2419200000 2496000000>,
+		/* Speed bin 1 */
+		<300000000  345600000  422400000
+		 499200000  576000000  652800000
+		 729600000  806400000  902400000
+		 979200000 1056000000 1132800000
+		1190400000 1267200000 1344000000
+		1420800000 1497600000 1574400000
+		1651200000 1728000000 1804800000
+		1881600000 1958400000 2035200000
+		2112000000 2208000000>;
 
 	qcom,cpr-ro-scaling-factor =
 		<4001 4019 3747 3758 3564 3480 2336
@@ -362,6 +476,16 @@
 		 1559 1392>;
 
 	qcom,cpr-open-loop-voltage-fuse-adjustment =
+		/* Speed bin 0 */
+		<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>,
+		/* Speed bin 1 */
 		<8000 0 0 52000>,
 		<8000 0 0 52000>,
 		<8000 0 0 52000>,
@@ -372,6 +496,16 @@
 		<8000 0 0 52000>;
 
 	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>,
+		/* Speed bin 1 */
 		<0 0 0 50000>,
 		<0 0 0 50000>,
 		<0 0 0 50000>,