mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
7313264b89
- Two new drivers from Pali Rohár and N900 hackers: rx51_battery and
bq2415x_charger. The drivers are a part of a solution to replace the
proprietary Nokia BME stack;
- Power supply core now registers devices with a thermal cooling
subsystem, so we can now automatically throttle charging. Thanks to
Ramakrishna Pallala!
- Device tree support for ab8500 and max8925_power drivers;
- Random fixups and enhancements for a bunch of drivers.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iQIcBAABAgAGBQJQyFGdAAoJEGgI9fZJve1bYy8P/iu4XRL2kNwmPD7fMO+bZSao
xCSi8zRCnOtDutB48MQXIDTi1+I64+Qqq5xTuHW5n/T0zJ88biGBZfmJLjM88oQ4
ZqfO/axT6/MNFXTQtxEvXtn/AoM6lp9ZLmIbs7mkSpcnuG8iY5eovKfeyyNiAoGh
W6ISc9d1zZl8JYZXkkX4y5uxsH/t34rPjWJqygMulJrVdePpC9fNWwDYnul6T7iF
/bbqIH/j88HSYNDN518dv/ot+OfPn0vuxD4WzGAqC7ddHICtuaw8TBfXHmr6j4Mf
o9ytC/dH+AQ6Tcs+h7mbz/dfL4Gs9JK2LgRX2z1DtFa6uTw5jwEtZSuDF4DKovEg
71T67dsHDKJkQgGMDfDw1BrlLjQr8hkaWroF8CdmbRO0rRsfKamLQANG7mGkSu8B
l1W0ZzWEbHDteNB/wCkjoncXlcqoA8YiplyVSqf38aP8YuaeHMR3LRGLFwgXK3pB
lELh3cYSYLVpcqUgkRWcPrCUnLA2CkQy2B4INj5jFZilux7DzyIHMhWI2OuUs2rH
1rwTYO91gTVONuagZn8+lmsjs+Yq1n2BcyrGMG2+ZYzruFaQ+brQsCbQR0hdRuaU
zWLENqwGJ/++XrFgw3/5orMZIZQzL/yq+MbIXtrgKcFRWwoxyzJuH63RMQf3S6yy
hxi7pYQmb9if+HPJZVVg
=Bb5O
-----END PGP SIGNATURE-----
Merge tag 'for-v3.8-merged' of git://git.infradead.org/battery-2.6
Pull battery subsystem updates from Anton Vorontsov:
"Highlights:
- Two new drivers from Pali Rohár and N900 hackers: rx51_battery and
bq2415x_charger. The drivers are a part of a solution to replace
the proprietary Nokia BME stack
- Power supply core now registers devices with a thermal cooling
subsystem, so we can now automatically throttle charging. Thanks
to Ramakrishna Pallala!
- Device tree support for ab8500 and max8925_power drivers
- Random fixups and enhancements for a bunch of drivers."
* tag 'for-v3.8-merged' of git://git.infradead.org/battery-2.6: (22 commits)
max8925_power: Add support for device-tree initialization
ab8500: Add devicetree support for chargalg
ab8500: Add devicetree support for charger
ab8500: Add devicetree support for btemp
ab8500: Add devicetree support for fuelgauge
twl4030_charger: Change TWL4030_MODULE_* ids to TWL_MODULE_*
jz4740-battery: Use devm_request_and_ioremap
jz4740-battery: Use devm_kzalloc
bq27x00_battery: Fixup nominal available capacity reporting
bq2415x_charger: Fix style issues
bq2415x_charger: Add Kconfig/Makefile entries
power_supply: Add bq2415x charger driver
power_supply: Add new Nokia RX-51 (N900) power supply battery driver
max17042_battery: Fix missing verify_model_lock() return value check
ds2782_battery: Fix signedness bug in ds278x_read_reg16()
lp8788-charger: Fix ADC channel names
lp8788-charger: Fix wrong ADC conversion
lp8788-charger: Use consumer device name on setting IIO channels
power_supply: Register power supply for thermal cooling device
power_supply: Add support for CHARGE_CONTROL_* attributes
...
353 lines
9.9 KiB
Text
353 lines
9.9 KiB
Text
menuconfig POWER_SUPPLY
|
|
bool "Power supply class support"
|
|
help
|
|
Say Y here to enable power supply class support. This allows
|
|
power supply (batteries, AC, USB) monitoring by userspace
|
|
via sysfs and uevent (if available) and/or APM kernel interface
|
|
(if selected below).
|
|
|
|
if POWER_SUPPLY
|
|
|
|
config POWER_SUPPLY_DEBUG
|
|
bool "Power supply debug"
|
|
help
|
|
Say Y here to enable debugging messages for power supply class
|
|
and drivers.
|
|
|
|
config PDA_POWER
|
|
tristate "Generic PDA/phone power driver"
|
|
depends on !S390
|
|
help
|
|
Say Y here to enable generic power driver for PDAs and phones with
|
|
one or two external power supplies (AC/USB) connected to main and
|
|
backup batteries, and optional builtin charger.
|
|
|
|
config APM_POWER
|
|
tristate "APM emulation for class batteries"
|
|
depends on APM_EMULATION
|
|
help
|
|
Say Y here to enable support APM status emulation using
|
|
battery class devices.
|
|
|
|
config GENERIC_ADC_BATTERY
|
|
tristate "Generic battery support using IIO"
|
|
depends on IIO
|
|
help
|
|
Say Y here to enable support for the generic battery driver
|
|
which uses IIO framework to read adc.
|
|
|
|
config MAX8925_POWER
|
|
tristate "MAX8925 battery charger support"
|
|
depends on MFD_MAX8925
|
|
help
|
|
Say Y here to enable support for the battery charger in the Maxim
|
|
MAX8925 PMIC.
|
|
|
|
config WM831X_BACKUP
|
|
tristate "WM831X backup battery charger support"
|
|
depends on MFD_WM831X
|
|
help
|
|
Say Y here to enable support for the backup battery charger
|
|
in the Wolfson Microelectronics WM831x PMICs.
|
|
|
|
config WM831X_POWER
|
|
tristate "WM831X PMU support"
|
|
depends on MFD_WM831X
|
|
help
|
|
Say Y here to enable support for the power management unit
|
|
provided by Wolfson Microelectronics WM831x PMICs.
|
|
|
|
config WM8350_POWER
|
|
tristate "WM8350 PMU support"
|
|
depends on MFD_WM8350
|
|
help
|
|
Say Y here to enable support for the power management unit
|
|
provided by the Wolfson Microelectronics WM8350 PMIC.
|
|
|
|
config TEST_POWER
|
|
tristate "Test power driver"
|
|
help
|
|
This driver is used for testing. It's safe to say M here.
|
|
|
|
config BATTERY_88PM860X
|
|
tristate "Marvell 88PM860x battery driver"
|
|
depends on MFD_88PM860X
|
|
help
|
|
Say Y here to enable battery monitor for Marvell 88PM860x chip.
|
|
|
|
config BATTERY_DS2760
|
|
tristate "DS2760 battery driver (HP iPAQ & others)"
|
|
depends on W1 && W1_SLAVE_DS2760
|
|
help
|
|
Say Y here to enable support for batteries with ds2760 chip.
|
|
|
|
config BATTERY_DS2780
|
|
tristate "DS2780 battery driver"
|
|
depends on HAS_IOMEM
|
|
select W1
|
|
select W1_SLAVE_DS2780
|
|
help
|
|
Say Y here to enable support for batteries with ds2780 chip.
|
|
|
|
config BATTERY_DS2781
|
|
tristate "DS2781 battery driver"
|
|
depends on HAS_IOMEM
|
|
select W1
|
|
select W1_SLAVE_DS2781
|
|
help
|
|
If you enable this you will have the DS2781 battery driver support.
|
|
|
|
The battery monitor chip is used in many batteries/devices
|
|
as the one who is responsible for charging/discharging/monitoring
|
|
Li+ batteries.
|
|
|
|
If you are unsure, say N.
|
|
|
|
config BATTERY_DS2782
|
|
tristate "DS2782/DS2786 standalone gas-gauge"
|
|
depends on I2C
|
|
help
|
|
Say Y here to enable support for the DS2782/DS2786 standalone battery
|
|
gas-gauge.
|
|
|
|
config BATTERY_PMU
|
|
tristate "Apple PMU battery"
|
|
depends on PPC32 && ADB_PMU
|
|
help
|
|
Say Y here to expose battery information on Apple machines
|
|
through the generic battery class.
|
|
|
|
config BATTERY_OLPC
|
|
tristate "One Laptop Per Child battery"
|
|
depends on X86_32 && OLPC
|
|
help
|
|
Say Y to enable support for the battery on the OLPC laptop.
|
|
|
|
config BATTERY_TOSA
|
|
tristate "Sharp SL-6000 (tosa) battery"
|
|
depends on MACH_TOSA && MFD_TC6393XB && TOUCHSCREEN_WM97XX
|
|
help
|
|
Say Y to enable support for the battery on the Sharp Zaurus
|
|
SL-6000 (tosa) models.
|
|
|
|
config BATTERY_COLLIE
|
|
tristate "Sharp SL-5500 (collie) battery"
|
|
depends on SA1100_COLLIE && MCP_UCB1200
|
|
help
|
|
Say Y to enable support for the battery on the Sharp Zaurus
|
|
SL-5500 (collie) models.
|
|
|
|
config BATTERY_WM97XX
|
|
bool "WM97xx generic battery driver"
|
|
depends on TOUCHSCREEN_WM97XX=y
|
|
help
|
|
Say Y to enable support for battery measured by WM97xx aux port.
|
|
|
|
config BATTERY_SBS
|
|
tristate "SBS Compliant gas gauge"
|
|
depends on I2C
|
|
help
|
|
Say Y to include support for SBS battery driver for SBS-compliant
|
|
gas gauges.
|
|
|
|
config BATTERY_BQ27x00
|
|
tristate "BQ27x00 battery driver"
|
|
help
|
|
Say Y here to enable support for batteries with BQ27x00 (I2C/HDQ) chips.
|
|
|
|
config BATTERY_BQ27X00_I2C
|
|
bool "BQ27200/BQ27500 support"
|
|
depends on BATTERY_BQ27x00
|
|
depends on I2C
|
|
default y
|
|
help
|
|
Say Y here to enable support for batteries with BQ27x00 (I2C) chips.
|
|
|
|
config BATTERY_BQ27X00_PLATFORM
|
|
bool "BQ27000 support"
|
|
depends on BATTERY_BQ27x00
|
|
default y
|
|
help
|
|
Say Y here to enable support for batteries with BQ27000 (HDQ) chips.
|
|
|
|
config BATTERY_DA9030
|
|
tristate "DA9030 battery driver"
|
|
depends on PMIC_DA903X
|
|
help
|
|
Say Y here to enable support for batteries charger integrated into
|
|
DA9030 PMIC.
|
|
|
|
config BATTERY_DA9052
|
|
tristate "Dialog DA9052 Battery"
|
|
depends on PMIC_DA9052
|
|
help
|
|
Say Y here to enable support for batteries charger integrated into
|
|
DA9052 PMIC.
|
|
|
|
config BATTERY_MAX17040
|
|
tristate "Maxim MAX17040 Fuel Gauge"
|
|
depends on I2C
|
|
help
|
|
MAX17040 is fuel-gauge systems for lithium-ion (Li+) batteries
|
|
in handheld and portable equipment. The MAX17040 is configured
|
|
to operate with a single lithium cell
|
|
|
|
config BATTERY_MAX17042
|
|
tristate "Maxim MAX17042/17047/17050/8997/8966 Fuel Gauge"
|
|
depends on I2C
|
|
help
|
|
MAX17042 is fuel-gauge systems for lithium-ion (Li+) batteries
|
|
in handheld and portable equipment. The MAX17042 is configured
|
|
to operate with a single lithium cell. MAX8997 and MAX8966 are
|
|
multi-function devices that include fuel gauages that are compatible
|
|
with MAX17042. This driver also supports max17047/50 chips which are
|
|
improved version of max17042.
|
|
|
|
config BATTERY_Z2
|
|
tristate "Z2 battery driver"
|
|
depends on I2C && MACH_ZIPIT2
|
|
help
|
|
Say Y to include support for the battery on the Zipit Z2.
|
|
|
|
config BATTERY_S3C_ADC
|
|
tristate "Battery driver for Samsung ADC based monitoring"
|
|
depends on S3C_ADC
|
|
help
|
|
Say Y here to enable support for iPAQ h1930/h1940/rx1950 battery
|
|
|
|
config CHARGER_88PM860X
|
|
tristate "Marvell 88PM860x Charger driver"
|
|
depends on MFD_88PM860X && BATTERY_88PM860X
|
|
help
|
|
Say Y here to enable charger for Marvell 88PM860x chip.
|
|
|
|
config CHARGER_PCF50633
|
|
tristate "NXP PCF50633 MBC"
|
|
depends on MFD_PCF50633
|
|
help
|
|
Say Y to include support for NXP PCF50633 Main Battery Charger.
|
|
|
|
config BATTERY_JZ4740
|
|
tristate "Ingenic JZ4740 battery"
|
|
depends on MACH_JZ4740
|
|
depends on MFD_JZ4740_ADC
|
|
help
|
|
Say Y to enable support for the battery on Ingenic JZ4740 based
|
|
boards.
|
|
|
|
This driver can be build as a module. If so, the module will be
|
|
called jz4740-battery.
|
|
|
|
config BATTERY_INTEL_MID
|
|
tristate "Battery driver for Intel MID platforms"
|
|
depends on INTEL_SCU_IPC && SPI
|
|
help
|
|
Say Y here to enable the battery driver on Intel MID
|
|
platforms.
|
|
|
|
config BATTERY_RX51
|
|
tristate "Nokia RX-51 (N900) battery driver"
|
|
depends on TWL4030_MADC
|
|
help
|
|
Say Y here to enable support for battery information on Nokia
|
|
RX-51, also known as N900 tablet.
|
|
|
|
config CHARGER_ISP1704
|
|
tristate "ISP1704 USB Charger Detection"
|
|
depends on USB_OTG_UTILS
|
|
help
|
|
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
|
|
help
|
|
Say Y here to enable support for TWL4030 Battery Charge Interface.
|
|
|
|
config CHARGER_LP8727
|
|
tristate "TI/National Semiconductor LP8727 charger driver"
|
|
depends on I2C
|
|
help
|
|
Say Y here to enable support for LP8727 Charger Driver.
|
|
|
|
config CHARGER_LP8788
|
|
tristate "TI LP8788 charger driver"
|
|
depends on MFD_LP8788
|
|
depends on LP8788_ADC
|
|
help
|
|
Say Y to enable support for the LP8788 linear charger.
|
|
|
|
config CHARGER_GPIO
|
|
tristate "GPIO charger"
|
|
depends on GPIOLIB
|
|
help
|
|
Say Y to include support for chargers which report their online status
|
|
through a GPIO pin.
|
|
|
|
This driver can be build as a module. If so, the module will be
|
|
called gpio-charger.
|
|
|
|
config CHARGER_MANAGER
|
|
bool "Battery charger manager for multiple chargers"
|
|
depends on REGULATOR && RTC_CLASS
|
|
select EXTCON
|
|
help
|
|
Say Y to enable charger-manager support, which allows multiple
|
|
chargers attached to a battery and multiple batteries attached to a
|
|
system. The charger-manager also can monitor charging status in
|
|
runtime and in suspend-to-RAM by waking up the system periodically
|
|
with help of suspend_again support.
|
|
|
|
config CHARGER_MAX8997
|
|
tristate "Maxim MAX8997/MAX8966 PMIC battery charger driver"
|
|
depends on MFD_MAX8997 && REGULATOR_MAX8997
|
|
help
|
|
Say Y to enable support for the battery charger control sysfs and
|
|
platform data of MAX8997/LP3974 PMICs.
|
|
|
|
config CHARGER_MAX8998
|
|
tristate "Maxim MAX8998/LP3974 PMIC battery charger driver"
|
|
depends on MFD_MAX8998 && REGULATOR_MAX8998
|
|
help
|
|
Say Y to enable support for the battery charger control sysfs and
|
|
platform data of MAX8998/LP3974 PMICs.
|
|
|
|
config CHARGER_BQ2415X
|
|
tristate "TI BQ2415x battery charger driver"
|
|
depends on I2C
|
|
help
|
|
Say Y to enable support for the TI BQ2415x battery charger
|
|
PMICs.
|
|
|
|
You'll need this driver to charge batteries on e.g. Nokia
|
|
RX-51/N900.
|
|
|
|
config CHARGER_SMB347
|
|
tristate "Summit Microelectronics SMB347 Battery Charger"
|
|
depends on I2C
|
|
select REGMAP_I2C
|
|
help
|
|
Say Y to include support for Summit Microelectronics SMB347
|
|
Battery Charger.
|
|
|
|
config AB8500_BM
|
|
bool "AB8500 Battery Management Driver"
|
|
depends on AB8500_CORE && AB8500_GPADC
|
|
help
|
|
Say Y to include support for AB8500 battery management.
|
|
|
|
source "drivers/power/reset/Kconfig"
|
|
|
|
endif # POWER_SUPPLY
|
|
|
|
source "drivers/power/avs/Kconfig"
|