diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-19 12:42:29 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-19 12:42:29 +0000 |
| commit | fc221525bd63887f74c18708ee1d654d019fa8c3 (patch) | |
| tree | bcb2eb985fcc152ab4441cc82690930c2bce39a3 /include | |
| parent | 0dbf165ec43dd7f61fc0d596083c136fde01530f (diff) | |
| parent | c6f0a0efb163b7d2e879f92197ab5e674868358e (diff) | |
| download | lwn-fc221525bd63887f74c18708ee1d654d019fa8c3.tar.gz lwn-fc221525bd63887f74c18708ee1d654d019fa8c3.zip | |
Merge remote-tracking branch 'regulator/topic/apply' into regulator-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/regulator/driver.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h index d10bb0f39c5e..23070fd83872 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h @@ -193,6 +193,10 @@ enum regulator_type { * * @vsel_reg: Register for selector when using regulator_regmap_X_voltage_ * @vsel_mask: Mask for register bitfield used for selector + * @apply_reg: Register for initiate voltage change on the output when + * using regulator_set_voltage_sel_regmap + * @apply_bit: Register bitfield used for initiate voltage change on the + * output when using regulator_set_voltage_sel_regmap * @enable_reg: Register for control when using regmap enable/disable ops * @enable_mask: Mask for control when using regmap enable/disable ops * @@ -218,6 +222,8 @@ struct regulator_desc { unsigned int vsel_reg; unsigned int vsel_mask; + unsigned int apply_reg; + unsigned int apply_bit; unsigned int enable_reg; unsigned int enable_mask; unsigned int bypass_reg; |