diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 11:58:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 11:58:47 -0400 |
commit | aae6f989c6e97ff8197717fa4d032ad4eba091a7 (patch) | |
tree | 3908e2748a91045688a4778872785b8b0660d073 /drivers/regulator/Makefile | |
parent | b34e5f55a1e6667a800280fc4045632c139b4e4e (diff) | |
parent | 6a2027abd2048f7f7fdcc6e11ff10b3d9b0d0899 (diff) |
Merge tag 'regulator-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator updates from Mark Brown:
- Support for putting regulators into bypass mode where they simply
switch their input to the output (mainly used for low power
retention).
- A new API for setting voltages based on a voltage plus tolerance
rather than an explicit voltage range.
- Lots of cleanups and API updates from Axel Lin.
- New driver for MAX8907.
* tag 'regulator-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (71 commits)
regulator: arizona-ldo: Remove top voltage
regulator: tps6586x: remove regulator-compatible from DT docs
regulator: tps65217.txt: remove regulator-compatible from DT docs
regulator: deprecate regulator-compatible DT property
regulator: fan53555: remove vsel_max not used
regulator: aat2870: Don't explicitly initialise the first field
extcon: arizona: Use bypass mode for MICVDD
regulator: wm831x-ldo: Add bypass support
regulator: arizona-micsupp: Support get/set bypass
regulator: arizona-ldo: Support get/set bypass
regulator: core: Provide regmap get/set bypass operations
regulator: core: Support bypass mode
regulator: Fairchild fan53555 support
regulator: twl: Remove another unused variable warning
regulator: core: Try using the parent device for the default regmap
regulator: core: Fast path non-deferred disables
regulator: core: Report microvolts in sysfs even with only list_voltage()
regulator: tps6586x: add support for SYS rail
regulator: lp872x: remove unnecessary function
regulator: lp872x: fix NULL pointer access problem
...
Diffstat (limited to 'drivers/regulator/Makefile')
-rw-r--r-- | drivers/regulator/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index 3342615cf25e..e431eed8a878 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile | |||
@@ -20,6 +20,7 @@ obj-$(CONFIG_REGULATOR_DA903X) += da903x.o | |||
20 | obj-$(CONFIG_REGULATOR_DA9052) += da9052-regulator.o | 20 | obj-$(CONFIG_REGULATOR_DA9052) += da9052-regulator.o |
21 | obj-$(CONFIG_REGULATOR_DBX500_PRCMU) += dbx500-prcmu.o | 21 | obj-$(CONFIG_REGULATOR_DBX500_PRCMU) += dbx500-prcmu.o |
22 | obj-$(CONFIG_REGULATOR_DB8500_PRCMU) += db8500-prcmu.o | 22 | obj-$(CONFIG_REGULATOR_DB8500_PRCMU) += db8500-prcmu.o |
23 | obj-$(CONFIG_REGULATOR_FAN53555) += fan53555.o | ||
23 | obj-$(CONFIG_REGULATOR_GPIO) += gpio-regulator.o | 24 | obj-$(CONFIG_REGULATOR_GPIO) += gpio-regulator.o |
24 | obj-$(CONFIG_REGULATOR_ISL6271A) += isl6271a-regulator.o | 25 | obj-$(CONFIG_REGULATOR_ISL6271A) += isl6271a-regulator.o |
25 | obj-$(CONFIG_REGULATOR_LP3971) += lp3971.o | 26 | obj-$(CONFIG_REGULATOR_LP3971) += lp3971.o |
@@ -30,6 +31,7 @@ obj-$(CONFIG_REGULATOR_LP8788) += lp8788-ldo.o | |||
30 | obj-$(CONFIG_REGULATOR_MAX1586) += max1586.o | 31 | obj-$(CONFIG_REGULATOR_MAX1586) += max1586.o |
31 | obj-$(CONFIG_REGULATOR_MAX8649) += max8649.o | 32 | obj-$(CONFIG_REGULATOR_MAX8649) += max8649.o |
32 | obj-$(CONFIG_REGULATOR_MAX8660) += max8660.o | 33 | obj-$(CONFIG_REGULATOR_MAX8660) += max8660.o |
34 | obj-$(CONFIG_REGULATOR_MAX8907) += max8907-regulator.o | ||
33 | obj-$(CONFIG_REGULATOR_MAX8925) += max8925-regulator.o | 35 | obj-$(CONFIG_REGULATOR_MAX8925) += max8925-regulator.o |
34 | obj-$(CONFIG_REGULATOR_MAX8952) += max8952.o | 36 | obj-$(CONFIG_REGULATOR_MAX8952) += max8952.o |
35 | obj-$(CONFIG_REGULATOR_MAX8997) += max8997.o | 37 | obj-$(CONFIG_REGULATOR_MAX8997) += max8997.o |