Commit efc828022e756683992c8d09bd15b3474ba3e9b6
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
Merge remote-tracking branch 'regulator/topic/lp872x' into regulator-next
Showing 1 changed file Side-by-side Diff
drivers/regulator/lp872x.c
| ... | ... | @@ -181,20 +181,6 @@ |
| 181 | 181 | return regmap_update_bits(lp->regmap, addr, mask, data); |
| 182 | 182 | } |
| 183 | 183 | |
| 184 | -static int _rdev_to_offset(struct regulator_dev *rdev) | |
| 185 | -{ | |
| 186 | - enum lp872x_regulator_id id = rdev_get_id(rdev); | |
| 187 | - | |
| 188 | - switch (id) { | |
| 189 | - case LP8720_ID_LDO1 ... LP8720_ID_BUCK: | |
| 190 | - return id; | |
| 191 | - case LP8725_ID_LDO1 ... LP8725_ID_BUCK2: | |
| 192 | - return id - LP8725_ID_BASE; | |
| 193 | - default: | |
| 194 | - return -EINVAL; | |
| 195 | - } | |
| 196 | -} | |
| 197 | - | |
| 198 | 184 | static int lp872x_get_timestep_usec(struct lp872x *lp) |
| 199 | 185 | { |
| 200 | 186 | enum lp872x_id chip = lp->chipid; |
| 201 | 187 | |
| 202 | 188 | |
| 203 | 189 | |
| ... | ... | @@ -234,28 +220,20 @@ |
| 234 | 220 | static int lp872x_regulator_enable_time(struct regulator_dev *rdev) |
| 235 | 221 | { |
| 236 | 222 | struct lp872x *lp = rdev_get_drvdata(rdev); |
| 237 | - enum lp872x_regulator_id regulator = rdev_get_id(rdev); | |
| 223 | + enum lp872x_regulator_id rid = rdev_get_id(rdev); | |
| 238 | 224 | int time_step_us = lp872x_get_timestep_usec(lp); |
| 239 | - int ret, offset; | |
| 225 | + int ret; | |
| 240 | 226 | u8 addr, val; |
| 241 | 227 | |
| 242 | 228 | if (time_step_us < 0) |
| 243 | 229 | return -EINVAL; |
| 244 | 230 | |
| 245 | - switch (regulator) { | |
| 246 | - case LP8720_ID_LDO1 ... LP8720_ID_LDO5: | |
| 247 | - case LP8725_ID_LDO1 ... LP8725_ID_LILO2: | |
| 248 | - offset = _rdev_to_offset(rdev); | |
| 249 | - if (offset < 0) | |
| 250 | - return -EINVAL; | |
| 251 | - | |
| 252 | - addr = LP872X_LDO1_VOUT + offset; | |
| 231 | + switch (rid) { | |
| 232 | + case LP8720_ID_LDO1 ... LP8720_ID_BUCK: | |
| 233 | + addr = LP872X_LDO1_VOUT + rid; | |
| 253 | 234 | break; |
| 254 | - case LP8720_ID_BUCK: | |
| 255 | - addr = LP8720_BUCK_VOUT1; | |
| 256 | - break; | |
| 257 | - case LP8725_ID_BUCK1: | |
| 258 | - addr = LP8725_BUCK1_VOUT1; | |
| 235 | + case LP8725_ID_LDO1 ... LP8725_ID_BUCK1: | |
| 236 | + addr = LP872X_LDO1_VOUT + rid - LP8725_ID_BASE; | |
| 259 | 237 | break; |
| 260 | 238 | case LP8725_ID_BUCK2: |
| 261 | 239 | addr = LP8725_BUCK2_VOUT1; |