commit dfbca245c6824a28e6a1ac3e1d57ea39ab503a99
author Linux Build Service Account <lnxbuild@localhost> Wed Apr 24 20:40:54 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Apr 24 20:40:53 2013 -0700
tree cc91a13e8c8d822299dfa24440fee493fe047f2c
parent ccc09727efff0d7b8f6edbfc1e59b229e725bdd1
parent af5b68b9b1a88832485b12b02bc58b3105d5f53b

Merge "msm: krait-regulator: add PWM mode settling time"

arch/arm/mach-msm/krait-regulator.c

diff --git a/arch/arm/mach-msm/krait-regulator.c b/arch/arm/mach-msm/krait-regulator.c
index ed9f639..52d20e3 100644
--- a/arch/arm/mach-msm/krait-regulator.c
+++ b/arch/arm/mach-msm/krait-regulator.c
@@ -410,7 +410,8 @@
 #define ONE_PHASE_COEFF		1000000
 #define TWO_PHASE_COEFF		2000000
 
-#define PHASE_SETTLING_TIME_US		10
+#define PWM_SETTLING_TIME_US		50
+#define PHASE_SETTLING_TIME_US		50
 static unsigned int pmic_gang_set_phases(struct krait_power_vreg *from,
 				int coeff_total)
 {
@@ -453,6 +454,7 @@
 			return rc;
 		} else {
 			pvreg->pfm_mode = false;
+			udelay(PWM_SETTLING_TIME_US);
 		}
 	}