mirror of
https://github.com/torvalds/linux.git
synced 2024-11-18 18:11:56 +00: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
...
52 lines
2.3 KiB
Makefile
52 lines
2.3 KiB
Makefile
ccflags-$(CONFIG_POWER_SUPPLY_DEBUG) := -DDEBUG
|
|
|
|
power_supply-y := power_supply_core.o
|
|
power_supply-$(CONFIG_SYSFS) += power_supply_sysfs.o
|
|
power_supply-$(CONFIG_LEDS_TRIGGERS) += power_supply_leds.o
|
|
|
|
obj-$(CONFIG_POWER_SUPPLY) += power_supply.o
|
|
obj-$(CONFIG_GENERIC_ADC_BATTERY) += generic-adc-battery.o
|
|
|
|
obj-$(CONFIG_PDA_POWER) += pda_power.o
|
|
obj-$(CONFIG_APM_POWER) += apm_power.o
|
|
obj-$(CONFIG_MAX8925_POWER) += max8925_power.o
|
|
obj-$(CONFIG_WM831X_BACKUP) += wm831x_backup.o
|
|
obj-$(CONFIG_WM831X_POWER) += wm831x_power.o
|
|
obj-$(CONFIG_WM8350_POWER) += wm8350_power.o
|
|
obj-$(CONFIG_TEST_POWER) += test_power.o
|
|
|
|
obj-$(CONFIG_BATTERY_88PM860X) += 88pm860x_battery.o
|
|
obj-$(CONFIG_BATTERY_DS2760) += ds2760_battery.o
|
|
obj-$(CONFIG_BATTERY_DS2780) += ds2780_battery.o
|
|
obj-$(CONFIG_BATTERY_DS2781) += ds2781_battery.o
|
|
obj-$(CONFIG_BATTERY_DS2782) += ds2782_battery.o
|
|
obj-$(CONFIG_BATTERY_PMU) += pmu_battery.o
|
|
obj-$(CONFIG_BATTERY_OLPC) += olpc_battery.o
|
|
obj-$(CONFIG_BATTERY_TOSA) += tosa_battery.o
|
|
obj-$(CONFIG_BATTERY_COLLIE) += collie_battery.o
|
|
obj-$(CONFIG_BATTERY_WM97XX) += wm97xx_battery.o
|
|
obj-$(CONFIG_BATTERY_SBS) += sbs-battery.o
|
|
obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o
|
|
obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o
|
|
obj-$(CONFIG_BATTERY_DA9052) += da9052-battery.o
|
|
obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o
|
|
obj-$(CONFIG_BATTERY_MAX17042) += max17042_battery.o
|
|
obj-$(CONFIG_BATTERY_Z2) += z2_battery.o
|
|
obj-$(CONFIG_BATTERY_S3C_ADC) += s3c_adc_battery.o
|
|
obj-$(CONFIG_CHARGER_88PM860X) += 88pm860x_charger.o
|
|
obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o
|
|
obj-$(CONFIG_BATTERY_JZ4740) += jz4740-battery.o
|
|
obj-$(CONFIG_BATTERY_INTEL_MID) += intel_mid_battery.o
|
|
obj-$(CONFIG_AB8500_BM) += ab8500_charger.o ab8500_btemp.o ab8500_fg.o abx500_chargalg.o
|
|
obj-$(CONFIG_CHARGER_ISP1704) += isp1704_charger.o
|
|
obj-$(CONFIG_CHARGER_MAX8903) += max8903_charger.o
|
|
obj-$(CONFIG_CHARGER_TWL4030) += twl4030_charger.o
|
|
obj-$(CONFIG_CHARGER_LP8727) += lp8727_charger.o
|
|
obj-$(CONFIG_CHARGER_LP8788) += lp8788-charger.o
|
|
obj-$(CONFIG_CHARGER_GPIO) += gpio-charger.o
|
|
obj-$(CONFIG_CHARGER_MANAGER) += charger-manager.o
|
|
obj-$(CONFIG_CHARGER_MAX8997) += max8997_charger.o
|
|
obj-$(CONFIG_CHARGER_MAX8998) += max8998_charger.o
|
|
obj-$(CONFIG_POWER_AVS) += avs/
|
|
obj-$(CONFIG_CHARGER_SMB347) += smb347-charger.o
|