diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-05 16:19:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-05 16:19:15 -0700 |
| commit | 91c2ff7708d4edf73ef1f0abb3ea4a44b4b0cf1d (patch) | |
| tree | 43ddc350e2ee5e0f20b5273accdcc597b89da1f6 /drivers/regulator/88pm800.c | |
| parent | 1325b6550a7b9cda52ee4c0da04fa9f93d2618fc (diff) | |
| parent | f955c8ba265540617da67d528ea74e50d48ad2be (diff) | |
Merge tag 'regulator-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator updates from Mark Brown:
"A couple of nice new features this month, the ability to map
regulators in order to allow voltage control by external coprocessors
is something people have been asking for for a long time.
- improved support for switch only "regulators", allowing current
state to be read from the parent regulator but no setting.
- support for obtaining the register access method used to set
voltages, for use in systems which can offload control of this to a
coprocessor (typically for DVFS).
- support for Active-Semi AC8846, Dialog DA9211 and Texas Instruments
TPS65917"
* tag 'regulator-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (58 commits)
regulator: act8865: fix build when OF is not enabled
regulator: act8865: add act8846 to DT binding documentation
regulator: act8865: add support for act8846
regulator: act8865: prepare support for other act88xx devices
regulator: act8865: set correct number of regulators in pdata
regulator: act8865: Remove error variable in act8865_pmic_probe
regulator: act8865: fix parsing of platform data
regulator: tps65090: Set voltage for fixed regulators
regulator: core: Allow to get voltage count and list from parent
regulator: core: Get voltage from parent if not available
regulator: Add missing statics and inlines for stub functions
regulator: lp872x: Don't set constraints within the regulator driver
regmap: Fix return code for stub regmap_get_device()
regulator: s2mps11: Update module description and Kconfig to add S2MPU02 support
regulator: Add helpers for low-level register access
regmap: Allow regmap_get_device() to be used by modules
regmap: Add regmap_get_device
regulator: da9211: Remove unnecessary devm_regulator_unregister() calls
regulator: Add DT bindings for tps65218 PMIC regulators.
regulator: da9211: new regulator driver
...
Diffstat (limited to 'drivers/regulator/88pm800.c')
| -rw-r--r-- | drivers/regulator/88pm800.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/regulator/88pm800.c b/drivers/regulator/88pm800.c index 7a721d67e6a..4e6c8c61190 100644 --- a/drivers/regulator/88pm800.c +++ b/drivers/regulator/88pm800.c @@ -52,7 +52,6 @@ #define PM800_BUCK1_3 (0x3F) #define PM800_BUCK2 (0x40) #define PM800_BUCK3 (0x41) -#define PM800_BUCK3 (0x41) #define PM800_BUCK4 (0x42) #define PM800_BUCK4_1 (0x43) #define PM800_BUCK4_2 (0x44) |