Skip to contentSkip to conversation

regulator updates for v3.15

GIT PULL Mark Brown 1 participant 1 message Apr 24, 2014

lore
Share & tools
lore

Mark Brown

author
#0 lore raw

The following changes since commit a798c10faf62a505d24e5f6213fbaf904a39623f:

Linux 3.15-rc2 (2014-04-20 11:08:50 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git tags/regulator-v3.15-rc2

for you to fetch changes up to 38962571375149626cd282ef9d8e87e8faf21155:

Merge remote-tracking branch 'regulator/fix/pbias' into regulator-linus (2014-04-23 13:50:12 +0100)

----------------------------------------------------------------

regulator: Fixes for v3.15

A couple of things here:

- Fixes for pbias that didn't make it in during the merge window due to the driver coming in via MMC. The conversion to use helpers is a fix as it implements list_voltage() which the main user (MMC) relies on for correct functioning.
- Change the !REGULATOR stub for optional regulators to return an error rather than a dummy; this is more in keeping with the intended use of optional regulators and fixes some issues seen MMC where it got confused by a dummy being provided.

----------------------------------------------------------------
Axel Lin (2):
regulator: pbias: Fix is_enabled callback implementation
regulator: pbias: Convert to use regmap helper functions

Mark Brown (2):
Merge remote-tracking branch 'regulator/fix/core' into regulator-linus Merge remote-tracking branch 'regulator/fix/pbias' into regulator-linus

Tim Kryger (1):
regulator: core: Return error in get optional stub

 drivers/regulator/pbias-regulator.c | 76 ++++++++++---------------------------
 include/linux/regulator/consumer.h  |  4 +-
 2 files changed, 22 insertions(+), 58 deletions(-)