mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 20:51:44 +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
...
55 lines
2.4 KiB
Makefile
55 lines
2.4 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_BATTERY_RX51) += rx51_battery.o
|
|
obj-$(CONFIG_AB8500_BM) += ab8500_bmdata.o 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_CHARGER_BQ2415X) += bq2415x_charger.o
|
|
obj-$(CONFIG_POWER_AVS) += avs/
|
|
obj-$(CONFIG_CHARGER_SMB347) += smb347-charger.o
|
|
obj-$(CONFIG_POWER_RESET) += reset/
|