summaryrefslogtreecommitdiffstats
path: root/drivers/power/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-27 10:12:35 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-27 10:12:35 -0700
commitea0ca3a843babd50c22dfbb5cf2d9a14df821b2b (patch)
tree0d27fc6d7b9a0a2cdfe29833eb84ee07beac91ab /drivers/power/Kconfig
parent74e6392ca3fd445a775dd42b54d5e42cf1e706e6 (diff)
parent906649de0eacde7a643b5a0750de6207441ad54f (diff)
downloadblackbird-op-linux-ea0ca3a843babd50c22dfbb5cf2d9a14df821b2b.tar.gz
blackbird-op-linux-ea0ca3a843babd50c22dfbb5cf2d9a14df821b2b.zip
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6: PXA: Use dev_pm_ops in z2_battery ds2760_battery: Fix rated capacity of the hx4700 1800mAh battery ds2760_battery: Fix indexing of the 4 active full EEPROM registers power: Make test_power driver more dynamic. bq27x00_battery: Name of cycle count property max8903_charger: Add GENERIC_HARDIRQS as a dependency (fixes S390 build) ARM: RX-51: Enable isp1704 power on/off isp1704_charger: Allow board specific powering routine gpio-charger: Add gpio_charger_resume power_supply: Add driver for MAX8903 charger
Diffstat (limited to 'drivers/power/Kconfig')
-rw-r--r--drivers/power/Kconfig9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index dc8c531ed276..e57b50b38565 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -210,6 +210,15 @@ config CHARGER_ISP1704
Say Y to enable support for USB Charger Detection with
ISP1707/ISP1704 USB transceivers.
+config CHARGER_MAX8903
+ tristate "MAX8903 Battery DC-DC Charger for USB and Adapter Power"
+ depends on GENERIC_HARDIRQS
+ help
+ Say Y to enable support for the MAX8903 DC-DC charger and sysfs.
+ The driver supports controlling charger-enable and current-limit
+ pins based on the status of charger connections with interrupt
+ handlers.
+
config CHARGER_TWL4030
tristate "OMAP TWL4030 BCI charger driver"
depends on TWL4030_CORE
OpenPOWER on IntegriCloud