aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles Keepax <ckeepax@opensource.wolfsonmicro.com>2017-03-28 10:14:41 -0400
committerMark Brown <broonie@kernel.org>2017-04-06 14:29:37 -0400
commitf7d37bc3cb20828ac43b22cbd40222877ee2c46a (patch)
treefc8925fad5871c81f776ed6b58cbfe729abdf681
parenta7a453f56a1a116027f84ac53b365eb045a0e279 (diff)
regulator: helpers: Add regmap set_pull_down helper
Add a helper function regulator_set_pull_down_regmap to allow regmap based regulators to easily enable pull down. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--drivers/regulator/helpers.c18
-rw-r--r--include/linux/regulator/driver.h8
2 files changed, 26 insertions, 0 deletions
diff --git a/drivers/regulator/helpers.c b/drivers/regulator/helpers.c
index a75e7da49af8..2ae7c3ac5940 100644
--- a/drivers/regulator/helpers.c
+++ b/drivers/regulator/helpers.c
@@ -464,6 +464,24 @@ int regulator_set_soft_start_regmap(struct regulator_dev *rdev)
464EXPORT_SYMBOL_GPL(regulator_set_soft_start_regmap); 464EXPORT_SYMBOL_GPL(regulator_set_soft_start_regmap);
465 465
466/** 466/**
467 * regulator_set_pull_down_regmap - Default set_pull_down() using regmap
468 *
469 * @rdev: device to operate on.
470 */
471int regulator_set_pull_down_regmap(struct regulator_dev *rdev)
472{
473 unsigned int val;
474
475 val = rdev->desc->pull_down_val_on;
476 if (!val)
477 val = rdev->desc->pull_down_mask;
478
479 return regmap_update_bits(rdev->regmap, rdev->desc->pull_down_reg,
480 rdev->desc->pull_down_mask, val);
481}
482EXPORT_SYMBOL_GPL(regulator_set_pull_down_regmap);
483
484/**
467 * regulator_get_bypass_regmap - Default get_bypass() using regmap 485 * regulator_get_bypass_regmap - Default get_bypass() using regmap
468 * 486 *
469 * @rdev: device to operate on. 487 * @rdev: device to operate on.
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index 1054c033e783..8a9078dd2a5f 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -296,6 +296,10 @@ enum regulator_type {
296 * @soft_start_mask: Mask for control when using regmap set_soft_start 296 * @soft_start_mask: Mask for control when using regmap set_soft_start
297 * @soft_start_val_on: Enabling value for control when using regmap 297 * @soft_start_val_on: Enabling value for control when using regmap
298 * set_soft_start 298 * set_soft_start
299 * @pull_down_reg: Register for control when using regmap set_pull_down
300 * @pull_down_mask: Mask for control when using regmap set_pull_down
301 * @pull_down_val_on: Enabling value for control when using regmap
302 * set_pull_down
299 * 303 *
300 * @enable_time: Time taken for initial enable of regulator (in uS). 304 * @enable_time: Time taken for initial enable of regulator (in uS).
301 * @off_on_delay: guard time (in uS), before re-enabling a regulator 305 * @off_on_delay: guard time (in uS), before re-enabling a regulator
@@ -352,6 +356,9 @@ struct regulator_desc {
352 unsigned int soft_start_reg; 356 unsigned int soft_start_reg;
353 unsigned int soft_start_mask; 357 unsigned int soft_start_mask;
354 unsigned int soft_start_val_on; 358 unsigned int soft_start_val_on;
359 unsigned int pull_down_reg;
360 unsigned int pull_down_mask;
361 unsigned int pull_down_val_on;
355 362
356 unsigned int enable_time; 363 unsigned int enable_time;
357 364
@@ -484,6 +491,7 @@ int regulator_set_voltage_time_sel(struct regulator_dev *rdev,
484int regulator_set_bypass_regmap(struct regulator_dev *rdev, bool enable); 491int regulator_set_bypass_regmap(struct regulator_dev *rdev, bool enable);
485int regulator_get_bypass_regmap(struct regulator_dev *rdev, bool *enable); 492int regulator_get_bypass_regmap(struct regulator_dev *rdev, bool *enable);
486int regulator_set_soft_start_regmap(struct regulator_dev *rdev); 493int regulator_set_soft_start_regmap(struct regulator_dev *rdev);
494int regulator_set_pull_down_regmap(struct regulator_dev *rdev);
487 495
488int regulator_set_active_discharge_regmap(struct regulator_dev *rdev, 496int regulator_set_active_discharge_regmap(struct regulator_dev *rdev,
489 bool enable); 497 bool enable);