diff options
Diffstat (limited to 'drivers/regulator/s2mps11.c')
-rw-r--r-- | drivers/regulator/s2mps11.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c index c9f16e17920f..2f62564ca936 100644 --- a/drivers/regulator/s2mps11.c +++ b/drivers/regulator/s2mps11.c | |||
@@ -42,7 +42,7 @@ static int get_ramp_delay(int ramp_delay) | |||
42 | { | 42 | { |
43 | unsigned char cnt = 0; | 43 | unsigned char cnt = 0; |
44 | 44 | ||
45 | ramp_delay /= 6; | 45 | ramp_delay /= 6250; |
46 | 46 | ||
47 | while (true) { | 47 | while (true) { |
48 | ramp_delay = ramp_delay >> 1; | 48 | ramp_delay = ramp_delay >> 1; |
@@ -113,6 +113,7 @@ static struct regulator_ops s2mps11_buck_ops = { | |||
113 | .min_uV = S2MPS11_BUCK_MIN1, \ | 113 | .min_uV = S2MPS11_BUCK_MIN1, \ |
114 | .uV_step = S2MPS11_BUCK_STEP1, \ | 114 | .uV_step = S2MPS11_BUCK_STEP1, \ |
115 | .n_voltages = S2MPS11_BUCK_N_VOLTAGES, \ | 115 | .n_voltages = S2MPS11_BUCK_N_VOLTAGES, \ |
116 | .ramp_delay = S2MPS11_RAMP_DELAY, \ | ||
116 | .vsel_reg = S2MPS11_REG_B1CTRL2 + (num - 1) * 2, \ | 117 | .vsel_reg = S2MPS11_REG_B1CTRL2 + (num - 1) * 2, \ |
117 | .vsel_mask = S2MPS11_BUCK_VSEL_MASK, \ | 118 | .vsel_mask = S2MPS11_BUCK_VSEL_MASK, \ |
118 | .enable_reg = S2MPS11_REG_B1CTRL1 + (num - 1) * 2, \ | 119 | .enable_reg = S2MPS11_REG_B1CTRL1 + (num - 1) * 2, \ |
@@ -128,6 +129,7 @@ static struct regulator_ops s2mps11_buck_ops = { | |||
128 | .min_uV = S2MPS11_BUCK_MIN1, \ | 129 | .min_uV = S2MPS11_BUCK_MIN1, \ |
129 | .uV_step = S2MPS11_BUCK_STEP1, \ | 130 | .uV_step = S2MPS11_BUCK_STEP1, \ |
130 | .n_voltages = S2MPS11_BUCK_N_VOLTAGES, \ | 131 | .n_voltages = S2MPS11_BUCK_N_VOLTAGES, \ |
132 | .ramp_delay = S2MPS11_RAMP_DELAY, \ | ||
131 | .vsel_reg = S2MPS11_REG_B5CTRL2, \ | 133 | .vsel_reg = S2MPS11_REG_B5CTRL2, \ |
132 | .vsel_mask = S2MPS11_BUCK_VSEL_MASK, \ | 134 | .vsel_mask = S2MPS11_BUCK_VSEL_MASK, \ |
133 | .enable_reg = S2MPS11_REG_B5CTRL1, \ | 135 | .enable_reg = S2MPS11_REG_B5CTRL1, \ |
@@ -143,6 +145,7 @@ static struct regulator_ops s2mps11_buck_ops = { | |||
143 | .min_uV = S2MPS11_BUCK_MIN1, \ | 145 | .min_uV = S2MPS11_BUCK_MIN1, \ |
144 | .uV_step = S2MPS11_BUCK_STEP1, \ | 146 | .uV_step = S2MPS11_BUCK_STEP1, \ |
145 | .n_voltages = S2MPS11_BUCK_N_VOLTAGES, \ | 147 | .n_voltages = S2MPS11_BUCK_N_VOLTAGES, \ |
148 | .ramp_delay = S2MPS11_RAMP_DELAY, \ | ||
146 | .vsel_reg = S2MPS11_REG_B6CTRL2 + (num - 6) * 2, \ | 149 | .vsel_reg = S2MPS11_REG_B6CTRL2 + (num - 6) * 2, \ |
147 | .vsel_mask = S2MPS11_BUCK_VSEL_MASK, \ | 150 | .vsel_mask = S2MPS11_BUCK_VSEL_MASK, \ |
148 | .enable_reg = S2MPS11_REG_B6CTRL1 + (num - 6) * 2, \ | 151 | .enable_reg = S2MPS11_REG_B6CTRL1 + (num - 6) * 2, \ |
@@ -158,6 +161,7 @@ static struct regulator_ops s2mps11_buck_ops = { | |||
158 | .min_uV = S2MPS11_BUCK_MIN3, \ | 161 | .min_uV = S2MPS11_BUCK_MIN3, \ |
159 | .uV_step = S2MPS11_BUCK_STEP3, \ | 162 | .uV_step = S2MPS11_BUCK_STEP3, \ |
160 | .n_voltages = S2MPS11_BUCK_N_VOLTAGES, \ | 163 | .n_voltages = S2MPS11_BUCK_N_VOLTAGES, \ |
164 | .ramp_delay = S2MPS11_RAMP_DELAY, \ | ||
161 | .vsel_reg = S2MPS11_REG_B9CTRL2, \ | 165 | .vsel_reg = S2MPS11_REG_B9CTRL2, \ |
162 | .vsel_mask = S2MPS11_BUCK_VSEL_MASK, \ | 166 | .vsel_mask = S2MPS11_BUCK_VSEL_MASK, \ |
163 | .enable_reg = S2MPS11_REG_B9CTRL1, \ | 167 | .enable_reg = S2MPS11_REG_B9CTRL1, \ |
@@ -173,6 +177,7 @@ static struct regulator_ops s2mps11_buck_ops = { | |||
173 | .min_uV = S2MPS11_BUCK_MIN2, \ | 177 | .min_uV = S2MPS11_BUCK_MIN2, \ |
174 | .uV_step = S2MPS11_BUCK_STEP2, \ | 178 | .uV_step = S2MPS11_BUCK_STEP2, \ |
175 | .n_voltages = S2MPS11_BUCK_N_VOLTAGES, \ | 179 | .n_voltages = S2MPS11_BUCK_N_VOLTAGES, \ |
180 | .ramp_delay = S2MPS11_RAMP_DELAY, \ | ||
176 | .vsel_reg = S2MPS11_REG_B10CTRL2, \ | 181 | .vsel_reg = S2MPS11_REG_B10CTRL2, \ |
177 | .vsel_mask = S2MPS11_BUCK_VSEL_MASK, \ | 182 | .vsel_mask = S2MPS11_BUCK_VSEL_MASK, \ |
178 | .enable_reg = S2MPS11_REG_B10CTRL1, \ | 183 | .enable_reg = S2MPS11_REG_B10CTRL1, \ |