mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-18 10:13:57 +08:00
e665faa424
- Marvell 88pm860x charger and battery drivers;
- Texas Instruments LP8788 charger driver;
2. Two new power supply properties: whether a battery is authentic, and
chargers' maximal currents and voltages;
3. A lot of TI LP8727 Charger cleanups;
4. New features for Charger Manager, mainly now we can disable specific
regulators;
5. Random fixes and cleanups for other drivers.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iQIcBAABAgAGBQJQbjMFAAoJEGgI9fZJve1bR6gP/2Ri0etCU5zQMmbsFv5wxwHT
BNgqFYoLmtxAJm7afM/9Qo2GxSam/Gi6vW6jfYxVOEDt9hJ5zaaJBxM4XmKEBShR
PYlV9u45jGUCIHJXoi8DTND9Swz0VfVve9UtK5fVdXr73fYFemP8U86alI1MBL5Q
8U3F0V8rObjGKWZrzN4BreB8bfbZYQCUafpoGS1ids3Uwm38d4tDb/jx8guSV24D
LEhXy9unV9NdPExRn1FWFAgqjtgnnBv5SmpCBd6VwKNmpOgVB+H0CjOaOPzMgd+0
X6dpJQtbjGZOhHhkcAoWsXYgxS8WMtTqlSjHSgswJJ/fdjv8YJoT7ncyu5wItY1x
cN5NRBKVpnHv+fkQDE4xVWzEOH68lK8RoGksay0gvTJj3MQWwOpOANGHbsnMG6rj
GBzQ7pyMbDTK7n1oynvmSskF4BdvYHM+Ns7vPUOAzoduKrOnhPVDpk3rLSFZxQNO
RoqXbnNYqg4qROB9z8Drs95WD59fKjNTlfFr1moR2sr4wncEJiFduMz4dCOs7nq7
ahZxd95a2Bb6LbcN244+loGBXmx6KD6BurrDc3yTM3hl+oVx+MecVv9uoKvKlz4y
YPh9XrdCSfj9Ms7TOqW8XPDl/ZREswaCIer7x8XsL+K42fYkPKlrO3OUMHIbh+3e
rfkFPAR55bLcmtiaahp3
=LkdH
-----END PGP SIGNATURE-----
Merge tag 'for-v3.7' of git://git.infradead.org/battery-2.6
Pull battery updates from Anton Vorontsov:
"1. New drivers:
- Marvell 88pm860x charger and battery drivers;
- Texas Instruments LP8788 charger driver;
2. Two new power supply properties: whether a battery is authentic,
and chargers' maximal currents and voltages;
3. A lot of TI LP8727 Charger cleanups;
4. New features for Charger Manager, mainly now we can disable
specific regulators;
5. Random fixes and cleanups for other drivers."
Fix up trivial conflicts in <linux/mfd/88pm860x.h>
* tag 'for-v3.7' of git://git.infradead.org/battery-2.6: (52 commits)
pda_power: Remove ac_draw_failed goto and label
charger-manager: Add support sysfs entry for charger
charger-manager: Support limit of maximum possible
charger-manager: Check fully charged state of battery periodically
lp8727_charger: More pure cosmetic improvements
lp8727_charger: Fix checkpatch warning
lp8727_charger: Add description in the private data
lp8727_charger: Fix a typo - chg_parm to chg_param
lp8727_charger: Make some cosmetic changes in lp8727_delayed_func()
lp8727_charger: Clean up lp8727_charger_changed()
lp8727_charger: Return if the battery is discharging
lp8727_charger: Make lp8727_charger_get_propery() simpler
lp8727_charger: Make lp8727_ctrl_switch() inline
lp8727_charger: Make lp8727_init_device() shorter
lp8727_charger: Clean up lp8727_is_charger_attached()
lp8727_charger: Use specific definition
lp8727_charger: Clean up lp8727 definitions
lp8727_charger: Use the definition rather than enum
lp8727_charger: Fix code for getting battery temp
lp8727_charger: Clear interrrupts at inital time
...
341 lines
9.6 KiB
Plaintext
341 lines
9.6 KiB
Plaintext
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 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_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.
|
|
|
|
config AB8500_BATTERY_THERM_ON_BATCTRL
|
|
bool "Thermistor connected on BATCTRL ADC"
|
|
depends on AB8500_BM
|
|
help
|
|
Say Y to enable battery temperature measurements using
|
|
thermistor connected on BATCTRL ADC.
|
|
endif # POWER_SUPPLY
|
|
|
|
source "drivers/power/avs/Kconfig"
|