From 31cac5b597e7b9109778cc4dc90627307e63d846 Mon Sep 17 00:00:00 2001 From: David Collins Date: Fri, 11 Nov 2016 17:13:52 -0800 Subject: [PATCH] ARM: dts: msm: update APC0/APC1/GFX aging allowed revisions for msm8998v2 Update the qcom,allow-aging-voltage-adjustment property for VDD_APC0, VDD_APC1, and VDD_GFX CPR regulators in order to match hardware fusing. Aging fuses will be blown for VDD_APC0 and VDD_APC1 on parts with local CPR revision 4 and for VDD_GFX on parts with global CPR revision 3. Also update the open-loop and closed-loop voltage adjustments so that the maximum 15 mV aging margin is applied on all parts in which aging adjustments are not enabled. Lastly, enable open-loop aging adjustment for VDD_GFX so that the aging voltage margin is added back into the open-loop voltage as needed at runtime. Change-Id: I481abdd54ce1e75bdebf908a61d6b484b377f55a CRs-Fixed: 1081084 Signed-off-by: David Collins --- .../boot/dts/qcom/msmcobalt-regulator.dtsi | 2 + arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi | 112 +++++++++--------- 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 f09f4d8b3adb..65e581b11d06 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi @@ -438,43 +438,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; @@ -483,8 +483,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 { @@ -601,19 +601,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>, @@ -621,19 +621,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>, @@ -646,8 +646,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 { @@ -728,7 +728,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)>, @@ -740,8 +740,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) @@ -765,7 +765,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 {