summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-11-15 04:07:50 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-11-15 04:07:50 -0800
commit16a21bcd77892df33f1cfac272c2e9089464731c (patch)
tree113831522119f9a780b91c221bcca744efe17778
parent2ce4f2671940bfa3b3f408cf9afbc4c94db41fd6 (diff)
parent31cac5b597e7b9109778cc4dc90627307e63d846 (diff)
Merge "ARM: dts: msm: update APC0/APC1/GFX aging allowed revisions for msm8998v2"
-rw-r--r--arch/arm/boot/dts/qcom/msmcobalt-regulator.dtsi2
-rw-r--r--arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi112
2 files changed, 58 insertions, 56 deletions
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-regulator.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-regulator.dtsi
index 1ba5905bcc36..32cf1663cf43 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-regulator.dtsi
+++ b/arch/arm/boot/dts/qcom/msmcobalt-regulator.dtsi
@@ -1101,6 +1101,8 @@
qcom,cpr-aging-ref-corner = <6>;
qcom,cpr-aging-ro-scaling-factor = <2950>;
qcom,allow-aging-voltage-adjustment = <0>;
+ qcom,allow-aging-open-loop-voltage-adjustment =
+ <1>;
};
};
};
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi
index 46a87400f869..36c92a68dd4f 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi
+++ b/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi
@@ -456,43 +456,43 @@
qcom,cpr-open-loop-voltage-fuse-adjustment =
/* Speed bin 0 */
- <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>,
+ <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>,
/* Speed bin 1 */
- <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>;
+ <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>;
qcom,cpr-closed-loop-voltage-fuse-adjustment =
/* Speed bin 0 */
- <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>,
+ <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>,
/* Speed bin 1 */
- <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>;
+ <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>;
qcom,allow-voltage-interpolation;
qcom,allow-quotient-interpolation;
@@ -501,8 +501,8 @@
qcom,cpr-aging-ref-corner = <22 22>;
qcom,cpr-aging-ro-scaling-factor = <1620>;
qcom,allow-aging-voltage-adjustment =
- <0 0 0 1 1 1 1 1>,
- <0 0 0 1 1 1 1 1>;
+ <0 0 0 0 1 1 1 1>,
+ <0 0 0 0 1 1 1 1>;
};
&apc1_cpr {
@@ -619,19 +619,19 @@
qcom,cpr-open-loop-voltage-fuse-adjustment =
/* Speed bin 0 */
- <8000 0 0 52000>,
- <8000 0 0 52000>,
- <8000 0 0 52000>,
- <(-7000) (-15000) (-15000) 37000>,
+ < 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>,
/* Speed bin 1 */
- <8000 0 0 52000>,
- <8000 0 0 52000>,
- <8000 0 0 52000>,
- <(-7000) (-15000) (-15000) 37000>,
+ < 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>,
@@ -639,19 +639,19 @@
qcom,cpr-closed-loop-voltage-fuse-adjustment =
/* Speed bin 0 */
- <0 0 0 50000>,
- <0 0 0 50000>,
- <0 0 0 50000>,
- <(-15000) (-15000) (-15000) 35000>,
+ < 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>,
/* Speed bin 1 */
- <0 0 0 50000>,
- <0 0 0 50000>,
- <0 0 0 50000>,
- <(-15000) (-15000) (-15000) 35000>,
+ < 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>,
@@ -664,8 +664,8 @@
qcom,cpr-aging-ref-corner = <30 26>;
qcom,cpr-aging-ro-scaling-factor = <1700>;
qcom,allow-aging-voltage-adjustment =
- <0 0 0 1 1 1 1 1>,
- <0 0 0 1 1 1 1 1>;
+ <0 0 0 0 1 1 1 1>,
+ <0 0 0 0 1 1 1 1>;
};
&pm8005_s1 {
@@ -746,7 +746,7 @@
qcom,cpr-open-loop-voltage-fuse-adjustment =
< 60000 0 0 0>,
< 60000 0 0 0>,
- < 45000 (-15000) (-15000) (-15000)>,
+ < 60000 0 0 0>,
< 45000 (-15000) (-15000) (-15000)>,
< 45000 (-15000) (-15000) (-15000)>,
< 45000 (-15000) (-15000) (-15000)>,
@@ -758,8 +758,8 @@
0 29000 11000 0>,
< 90000 38000 28000 8000
0 29000 11000 0>,
- < 75000 23000 13000 (-7000)
- (-15000) 14000 (-4000) (-15000)>,
+ < 90000 38000 28000 8000
+ 0 29000 11000 0>,
< 75000 23000 13000 (-7000)
(-15000) 14000 (-4000) (-15000)>,
< 75000 23000 13000 (-7000)
@@ -783,7 +783,7 @@
qcom,cpr-aging-max-voltage-adjustment = <15000>;
qcom,cpr-aging-ref-corner = <8>;
qcom,cpr-aging-ro-scaling-factor = <1620>;
- qcom,allow-aging-voltage-adjustment = <0 0 1 1 1 1 1 1>;
+ qcom,allow-aging-voltage-adjustment = <0 0 0 1 1 1 1 1>;
};
&qusb_phy0 {