diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-13 09:36:45 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-13 09:36:45 -0800 |
commit | 5f194bf4853bcb6e7442518b70fb20a875ed34f0 (patch) | |
tree | 97b9381352a892d8de757897322b2493015e32c1 /include/linux/mfd/tps65218.h | |
parent | 1e19bded7f5d5152b7f53ee7356241ecb18905b0 (diff) | |
parent | 50b7baefe3e5a96f5aa8e9565fcfb0bda240b905 (diff) |
Merge tag 'regulator-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator updates from Mark Brown:
"A very quiet release for regulator, there's some new device support in
existing drivers here and a few fixes but nothing in the core.
Summary:
- New device support for Allwinner AXP813, Dialog DA223/4/5 and
Qualcomm PMI8994"
* tag 'regulator-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: tps65218: remove unused tps_info structure
regulator: tps65218: Fix strobe assignment
regulator: qcom_spmi: Include offset when translating voltages
regulator: qcom_spmi: Add support for pmi8994
regulator: da9211: update for supporting da9223/4/5
ASoC: pfuze100: Remove leading zero from '@08' notation
regulator: axp20x: Simplify axp20x_is_polyphase_slave implementation
regulator: axp20x: Add support for AXP813 regulators
Diffstat (limited to 'include/linux/mfd/tps65218.h')
-rw-r--r-- | include/linux/mfd/tps65218.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/include/linux/mfd/tps65218.h b/include/linux/mfd/tps65218.h index bccd2d68b1e3..f069c518c0ed 100644 --- a/include/linux/mfd/tps65218.h +++ b/include/linux/mfd/tps65218.h @@ -246,24 +246,6 @@ enum tps65218_irqs { }; /** - * struct tps_info - packages regulator constraints - * @id: Id of the regulator - * @name: Voltage regulator name - * @min_uV: minimum micro volts - * @max_uV: minimum micro volts - * @strobe: sequencing strobe value for the regulator - * - * This data is used to check the regualtor voltage limits while setting. - */ -struct tps_info { - int id; - const char *name; - int min_uV; - int max_uV; - int strobe; -}; - -/** * struct tps65218 - tps65218 sub-driver chip access routines * * Device data may be used to access the TPS65218 chip @@ -280,7 +262,6 @@ struct tps65218 { u32 irq_mask; struct regmap_irq_chip_data *irq_data; struct regulator_desc desc[TPS65218_NUM_REGULATOR]; - struct tps_info *info[TPS65218_NUM_REGULATOR]; struct regmap *regmap; u8 *strobes; }; |