diff options
| author | Mark Brown <broonie@kernel.org> | 2019-07-04 19:34:32 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-07-04 19:34:32 +0300 |
| commit | 65244e5b1f4fade54b490b47b871cefe1d7d07f0 (patch) | |
| tree | 7474acf605cd0ddb2cb3ca62cc4b41494a049105 /include/linux/regulator | |
| parent | f0386617dca6deaca241a01efb9a579d0d727e7f (diff) | |
| parent | 3c7577d442a76c2015dd765497395fb394b78051 (diff) | |
| download | linux-65244e5b1f4fade54b490b47b871cefe1d7d07f0.tar.xz | |
Merge branch 'regulator-5.3' into regulator-next
Diffstat (limited to 'include/linux/regulator')
| -rw-r--r-- | include/linux/regulator/driver.h | 6 | ||||
| -rw-r--r-- | include/linux/regulator/max8952.h | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h index d45ab52c91c9..08259a75fecd 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h @@ -283,6 +283,11 @@ enum regulator_type { * @vsel_range_mask: Mask for register bitfield used for range selector * @vsel_reg: Register for selector when using regulator_regmap_X_voltage_ * @vsel_mask: Mask for register bitfield used for selector + * @vsel_step: Specify the resolution of selector stepping when setting + * voltage. If 0, then no stepping is done (requested selector is + * set directly), if >0 then the regulator API will ramp the + * voltage up/down gradually each time increasing/decreasing the + * selector by the specified step value. * @csel_reg: Register for current limit selector using regmap set_current_limit * @csel_mask: Mask for register bitfield used for current limit selector * @apply_reg: Register for initiate voltage change on the output when @@ -357,6 +362,7 @@ struct regulator_desc { unsigned int vsel_range_mask; unsigned int vsel_reg; unsigned int vsel_mask; + unsigned int vsel_step; unsigned int csel_reg; unsigned int csel_mask; unsigned int apply_reg; diff --git a/include/linux/regulator/max8952.h b/include/linux/regulator/max8952.h index ebd99d2e62ad..8712c091abf0 100644 --- a/include/linux/regulator/max8952.h +++ b/include/linux/regulator/max8952.h @@ -105,9 +105,6 @@ enum { #define MAX8952_NUM_DVS_MODE 4 struct max8952_platform_data { - int gpio_vid0; - int gpio_vid1; - u32 default_mode; u32 dvs_mode[MAX8952_NUM_DVS_MODE]; /* MAX8952_DVS_MODEx_XXXXmV */ |