summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/boot/dts/qcom/sdm630-regulator.dtsi53
-rw-r--r--drivers/regulator/cprh-kbss-regulator.c2
2 files changed, 41 insertions, 14 deletions
diff --git a/arch/arm/boot/dts/qcom/sdm630-regulator.dtsi b/arch/arm/boot/dts/qcom/sdm630-regulator.dtsi
index c4adcfe1bdfb..19b0b6a43a1e 100644
--- a/arch/arm/boot/dts/qcom/sdm630-regulator.dtsi
+++ b/arch/arm/boot/dts/qcom/sdm630-regulator.dtsi
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -687,9 +687,9 @@
regulator-max-microvolt = <8>;
qcom,cpr-fuse-corners = <3>;
- qcom,cpr-fuse-combos = <24>;
- qcom,cpr-speed-bins = <3>;
- qcom,cpr-speed-bin-corners = <8 8 8>;
+ qcom,cpr-fuse-combos = <32>;
+ qcom,cpr-speed-bins = <4>;
+ qcom,cpr-speed-bin-corners = <8 8 8 8>;
qcom,cpr-corners = <8>;
qcom,cpr-corner-fmax-map = <2 4 8>;
@@ -783,9 +783,9 @@
regulator-max-microvolt = <11>;
qcom,cpr-fuse-corners = <5>;
- qcom,cpr-fuse-combos = <24>;
- qcom,cpr-speed-bins = <3>;
- qcom,cpr-speed-bin-corners = <10 10 11>;
+ qcom,cpr-fuse-combos = <32>;
+ qcom,cpr-speed-bins = <4>;
+ qcom,cpr-speed-bin-corners = <10 10 11 10>;
qcom,cpr-corners =
/* Speed bin 0 */
<10 10 10 10 10 10 10 10>,
@@ -794,7 +794,10 @@
<10 10 10 10 10 10 10 10>,
/* Speed bin 2 */
- <11 11 11 11 11 11 11 11>;
+ <11 11 11 11 11 11 11 11>,
+
+ /* Speed bin 3 */
+ <10 10 10 10 10 10 10 10>;
qcom,cpr-corner-fmax-map =
/* Speed bin 0 */
@@ -804,7 +807,10 @@
<2 4 6 9 10>,
/* Speed bin 2 */
- <2 4 6 9 11>;
+ <2 4 6 9 11>,
+
+ /* Speed bin 3 */
+ <2 4 6 9 10>;
qcom,cpr-voltage-ceiling =
/* Speed bin 0 */
@@ -820,7 +826,12 @@
/* Speed bin 2 */
<724000 724000 724000 788000
868000 868000 988000 988000
- 988000 1140000 1140000>;
+ 988000 1140000 1140000>,
+
+ /* Speed bin 3 */
+ <724000 724000 724000 788000
+ 868000 868000 988000 988000
+ 988000 1068000>;
qcom,cpr-voltage-floor =
/* Speed bin 0 */
@@ -836,7 +847,12 @@
/* Speed bin 2 */
<588000 588000 596000 652000
712000 712000 744000 784000
- 784000 844000 900000>;
+ 784000 844000 900000>,
+
+ /* Speed bin 3 */
+ <588000 588000 596000 652000
+ 712000 712000 744000 784000
+ 784000 844000>;
qcom,corner-frequencies =
/* Speed bin 0 */
@@ -855,7 +871,13 @@
<300000000 787200000 1113600000
1344000000 1516800000 1670400000
1881600000 2016000000 2150400000
- 2380800000 2515200000>;
+ 2380800000 2515200000>,
+
+ /* Speed bin 3 */
+ <300000000 787200000 1113600000
+ 1344000000 1516800000 1670400000
+ 1881600000 2016000000 2150400000
+ 2208000000>;
qcom,allow-voltage-interpolation;
qcom,allow-quotient-interpolation;
@@ -899,7 +921,12 @@
/* Speed bin 2 */
<40000 40000 40000 40000
40000 40000 40000 66000
- 66000 40000 40000>;
+ 66000 40000 40000>,
+
+ /* Speed bin 3 */
+ <40000 40000 40000 40000
+ 40000 40000 40000 66000
+ 66000 40000>;
};
};
};
diff --git a/drivers/regulator/cprh-kbss-regulator.c b/drivers/regulator/cprh-kbss-regulator.c
index f7a18611b5d2..7320f8066aef 100644
--- a/drivers/regulator/cprh-kbss-regulator.c
+++ b/drivers/regulator/cprh-kbss-regulator.c
@@ -82,7 +82,7 @@ struct cprh_kbss_fuses {
*/
#define CPRH_MSM8998_KBSS_FUSE_COMBO_COUNT 32
#define CPRH_SDM660_KBSS_FUSE_COMBO_COUNT 40
-#define CPRH_SDM630_KBSS_FUSE_COMBO_COUNT 24
+#define CPRH_SDM630_KBSS_FUSE_COMBO_COUNT 32
/*
* Constants which define the name of each fuse corner.