diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-26 19:49:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-26 19:49:09 -0700 |
| commit | f7816ad0f878dacd5f0120476f9b836ccf8699ea (patch) | |
| tree | 43c81a5697976af080e58e41ec84c7f5c7c29fbe /drivers/power/Kconfig | |
| parent | Merge tag 'regulator-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator (diff) | |
| parent | power: reset: add reboot mode driver (diff) | |
| download | linux-dev-f7816ad0f878dacd5f0120476f9b836ccf8699ea.tar.xz linux-dev-f7816ad0f878dacd5f0120476f9b836ccf8699ea.zip | |
Merge tag 'for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
Pull power supply and reset updates from Sebastian Reichel:
- introduce reboot mode driver
- add DT support to max8903
- add power supply support for axp221
- misc fixes
* tag 'for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
power: reset: add reboot mode driver
dt-bindings: power: reset: add document for reboot-mode driver
power_supply: fix return value of get_property
power: qcom_smbb: Make an extcon for usb cable detection
max8903: adds support for initiation via device tree
max8903: adds documentation for device tree bindings.
max8903: remove unnecessary 'out of memory' error message.
max8903: removes non zero validity checks on gpios.
max8903: adds requesting of gpios.
max8903: cleans up confusing relationship between dc_valid, dok and dcm.
max8903: store pointer to pdata instead of copying it.
power_supply: bq27xxx_battery: Group register mappings into one table
docs: Move brcm,bcm21664-resetmgr.txt
power/reset: make syscon_poweroff() static
power: axp20x_usb: Add support for usb power-supply on axp22x pmics
power_supply: bq27xxx_battery: Index register numbers by enum
power_supply: bq27xxx_battery: Fix copy/paste error in header comment
MAINTAINERS: Add file patterns for power supply device tree bindings
power: reset: keystone: Enable COMPILE_TEST
Diffstat (limited to 'drivers/power/Kconfig')
| -rw-r--r-- | drivers/power/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 0f11a0f4c369..acd4a1524a1e 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -394,6 +394,7 @@ config CHARGER_QCOM_SMBB tristate "Qualcomm Switch-Mode Battery Charger and Boost" depends on MFD_SPMI_PMIC || COMPILE_TEST depends on OF + depends on EXTCON help Say Y to include support for the Switch-Mode Battery Charger and Boost (SMBB) hardware found in Qualcomm PM8941 PMICs. The charger |