Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / drivers / regulator / stpmic1_regulator.c

diff --git a/drivers/regulator/stpmic1_regulator.c b/drivers/regulator/stpmic1_regulator.c
index f09061473613c5339a28c1e8646ea7d4413b74c4..f3d7d007ecbb43f110cbbaa76401adf1dcbf76a8 100644 (file)
--- a/drivers/regulator/stpmic1_regulator.c
+++ b/drivers/regulator/stpmic1_regulator.c
@@ -54,6 +54,8 @@ enum {
 
 /* Enable time worst case is 5000mV/(2250uV/uS) */
 #define PMIC_ENABLE_TIME_US 2200
+/* Ramp delay worst case is (2250uV/uS) */
+#define PMIC_RAMP_DELAY 2200
 
 static const struct regulator_linear_range buck1_ranges[] = {
        REGULATOR_LINEAR_RANGE(725000, 0, 4, 0),
@@ -208,6 +210,7 @@ static const struct regulator_ops stpmic1_switch_regul_ops = {
        .enable_val = 1, \
        .disable_val = 0, \
        .enable_time = PMIC_ENABLE_TIME_US, \
+       .ramp_delay = PMIC_RAMP_DELAY, \
        .supply_name = #base, \
 }
 
@@ -227,6 +230,7 @@ static const struct regulator_ops stpmic1_switch_regul_ops = {
        .enable_val = 1, \
        .disable_val = 0, \
        .enable_time = PMIC_ENABLE_TIME_US, \
+       .ramp_delay = PMIC_RAMP_DELAY, \
        .bypass_reg = LDO3_ACTIVE_CR, \
        .bypass_mask = LDO_BYPASS_MASK, \
        .bypass_val_on = LDO_BYPASS_MASK, \
@@ -248,6 +252,7 @@ static const struct regulator_ops stpmic1_switch_regul_ops = {
        .enable_val = 1, \
        .disable_val = 0, \
        .enable_time = PMIC_ENABLE_TIME_US, \
+       .ramp_delay = PMIC_RAMP_DELAY, \
        .supply_name = #base, \
 }
 
@@ -267,6 +272,7 @@ static const struct regulator_ops stpmic1_switch_regul_ops = {
        .enable_val = 1, \
        .disable_val = 0, \
        .enable_time = PMIC_ENABLE_TIME_US, \
+       .ramp_delay = PMIC_RAMP_DELAY, \
        .of_map_mode = stpmic1_map_mode, \
        .pull_down_reg = ids##_PULL_DOWN_REG, \
        .pull_down_mask = ids##_PULL_DOWN_MASK, \