diff options
| author | Mark Brown <broonie@sirena.org.uk> | 2013-04-28 02:13:37 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@sirena.org.uk> | 2013-04-28 02:13:37 +0100 |
| commit | 1d60a4cf975a196d585149e667f58cbca1a574fc (patch) | |
| tree | 208ae4c9539f349cd5fa87ac62b79cb6569c4d62 /include/linux/regulator | |
| parent | 0e340ce1ddcf41ca435ef695ef004a6f587c749e (diff) | |
| parent | ea88b132acdf3270b812117f622b0df044e6b76f (diff) | |
| download | linux-1d60a4cf975a196d585149e667f58cbca1a574fc.tar.gz linux-1d60a4cf975a196d585149e667f58cbca1a574fc.tar.bz2 linux-1d60a4cf975a196d585149e667f58cbca1a574fc.zip | |
Merge remote-tracking branch 'regulator/topic/enable-invert' into v3.9-rc8
Diffstat (limited to 'include/linux/regulator')
| -rw-r--r-- | include/linux/regulator/driver.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h index 2acdc66f8342..0dccc91b8ab4 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h @@ -199,6 +199,8 @@ enum regulator_type { * 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 + * @enable_is_inverted: A flag to indicate set enable_mask bits to disable + * when using regulator_enable_regmap and friends APIs. * @bypass_reg: Register for control when using regmap set_bypass * @bypass_mask: Mask for control when using regmap set_bypass * @@ -228,6 +230,7 @@ struct regulator_desc { unsigned int apply_bit; unsigned int enable_reg; unsigned int enable_mask; + bool enable_is_inverted; unsigned int bypass_reg; unsigned int bypass_mask; |