mirror of
https://github.com/torvalds/linux.git
synced 2024-11-05 19:41:54 +00:00
151173e8ce
- OpenFirmware/DeviceTree support for the Power Supply core: the core now
automatically populates supplied_from hierarchy from the device tree.
With these patches chargers and batteries can now lookup each other
without the board files support shim. Rhyland Klein at NVIDIA did the
work;
- New ST-Ericsson ABX500 hwmon driver. The driver is heavily using the
AB85xx core and depends on some recent changes to it, so that is why the
driver comes through the battery tree. It has an appropriate ack from
the hwmon maintainer (i.e. Guenter Roeck). Martin Persson at ST-Ericsson
and Hongbo Zhang at Linaro authored the driver;
- Final bits to sync AB85xx ST-Ericsson changes into mainline. The changes
touch mfd parts, but these were acked by the appropriate MFD maintainer
(i.e. Samuel Ortiz). Lee Jones at Linaro did most of the work and lead
the submission process.
Minor changes, but still worth mentioning:
- Battery temperature reporting fix for Nokia N900 phones;
- Versatile Express poweroff driver moved into drivers/power/reset/.
- Tree-wise: use devm_kzalloc() where appropriate;
- Tree-wise: dev_pm_ops cleanups/fixes.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iQIcBAABAgAGBQJRf1BPAAoJEGgI9fZJve1bwyoP/3Gv+qStzbN7mUtIVEvH3EAe
aVJwlODFzEZjk5xoiw7Dc8PuBE8O948hWOnQyCuUQ8+OfK6SyNIjexPYy3Z25a0F
cX9JMj7rtPWHvxo2q/YuKwBPZoxj/JIPyxwUT7akwXoHAV059fvcy9R1DfFX2Qur
hSP0NXTg+guvEpxGV4bC2l+LWZPmDFK9n0RsorttYaBvsiRDWl0c2TY2byofYlBw
++m/rI8Qgl8db8pKq/WDue62HtMt3kmZj6ZIgej3Wb0+GIRmYHMyPIyAkf82Wlw2
g2sGNPT7cstrSNOozegzJ7UghJObcYDFf10NCgvFMNjmAT1dAwdneQHEWy6Ek7pT
9X3e0LmaFqVbufFp4xFiLkMutsCLLTnGyXIbzs7RkTm3XBVIUqiDWtI6I6X44ohG
6PJn8vUlufu7owXrqFpgSBar2U1vfoQdhInmz4hbQeff0qn2nX/BGNwhxYptZ549
TudsI9WGzJ6fvYQ56zh6+BfiA0FmjhUiSKOtrXImrhxE6gUf3IOJyMQlkxLx5t8D
uuhBmO0J6kDi2lqF6alOEo+UDefJj4mUJn2tnIdis90+lNQlSV02GEtiwFT1zt1z
LFW0xshQkxZ4lMa28h35FB1/Z11ApUOe4Es+OKADDJhAnxdZzXcAwIRyPRRPgdsy
jTnJno+Kxk9wXLcekxVE
=5BdE
-----END PGP SIGNATURE-----
Merge tag 'for-v3.10' of git://git.infradead.org/battery-2.6
Pull battery updates from Anton Vorontsov:
"Highlights:
- OpenFirmware/DeviceTree support for the Power Supply core: the core
now automatically populates supplied_from hierarchy from the device
tree. With these patches chargers and batteries can now lookup
each other without the board files support shim. Rhyland Klein at
NVIDIA did the work
- New ST-Ericsson ABX500 hwmon driver. The driver is heavily using
the AB85xx core and depends on some recent changes to it, so that
is why the driver comes through the battery tree. It has an
appropriate ack from the hwmon maintainer (i.e. Guenter Roeck).
Martin Persson at ST-Ericsson and Hongbo Zhang at Linaro authored
the driver
- Final bits to sync AB85xx ST-Ericsson changes into mainline. The
changes touch mfd parts, but these were acked by the appropriate
MFD maintainer (ie Samuel Ortiz). Lee Jones at Linaro did most of
the work and lead the submission process.
Minor changes, but still worth mentioning:
- Battery temperature reporting fix for Nokia N900 phones
- Versatile Express poweroff driver moved into drivers/power/reset/
- Tree-wide: use devm_kzalloc() where appropriate
- Tree-wide: dev_pm_ops cleanups/fixes"
* tag 'for-v3.10' of git://git.infradead.org/battery-2.6: (112 commits)
pm2301-charger: Fix suspend/resume
charger-manager: Use kmemdup instead of kzalloc + memcpy
power_supply: Populate supplied_from hierarchy from the device tree
power_supply: Add core support for supplied_from
power_supply: Define Binding for power-supplies
rx51_battery: Fix reporting temperature
hwmon: Add ST-Ericsson ABX500 hwmon driver
ab8500_bmdata: Export abx500_res_to_temp tables for hwmon
ab8500_{bmdata,fg}: Add const attributes to some data arrays
ab8500_bmdata: Eliminate CamelCase warning of some variables
ab8500_btemp: Make ab8500_btemp_get* interfaces public
goldfish_battery: Use resource_size()
lp8788-charger: Use PAGE_SIZE for the sysfs read operation
max8925_power: Use devm_kzalloc()
da9030_battery: Use devm_kzalloc()
da9052-battery: Use devm_kzalloc()
ds2760_battery: Use devm_kzalloc()
ds2780_battery: Use devm_kzalloc()
gpio-charger: Use devm_kzalloc()
isp1704_charger: Use devm_kzalloc()
...
148 lines
5.8 KiB
Makefile
148 lines
5.8 KiB
Makefile
#
|
|
# Makefile for sensor chip drivers.
|
|
#
|
|
|
|
obj-$(CONFIG_HWMON) += hwmon.o
|
|
obj-$(CONFIG_HWMON_VID) += hwmon-vid.o
|
|
|
|
# APCI drivers
|
|
obj-$(CONFIG_SENSORS_ACPI_POWER) += acpi_power_meter.o
|
|
obj-$(CONFIG_SENSORS_ATK0110) += asus_atk0110.o
|
|
|
|
# Native drivers
|
|
# asb100, then w83781d go first, as they can override other drivers' addresses.
|
|
obj-$(CONFIG_SENSORS_ASB100) += asb100.o
|
|
obj-$(CONFIG_SENSORS_W83627HF) += w83627hf.o
|
|
obj-$(CONFIG_SENSORS_W83792D) += w83792d.o
|
|
obj-$(CONFIG_SENSORS_W83793) += w83793.o
|
|
obj-$(CONFIG_SENSORS_W83795) += w83795.o
|
|
obj-$(CONFIG_SENSORS_W83781D) += w83781d.o
|
|
obj-$(CONFIG_SENSORS_W83791D) += w83791d.o
|
|
|
|
obj-$(CONFIG_SENSORS_AB8500) += abx500.o ab8500.o
|
|
obj-$(CONFIG_SENSORS_ABITUGURU) += abituguru.o
|
|
obj-$(CONFIG_SENSORS_ABITUGURU3)+= abituguru3.o
|
|
obj-$(CONFIG_SENSORS_AD7314) += ad7314.o
|
|
obj-$(CONFIG_SENSORS_AD7414) += ad7414.o
|
|
obj-$(CONFIG_SENSORS_AD7418) += ad7418.o
|
|
obj-$(CONFIG_SENSORS_ADCXX) += adcxx.o
|
|
obj-$(CONFIG_SENSORS_ADM1021) += adm1021.o
|
|
obj-$(CONFIG_SENSORS_ADM1025) += adm1025.o
|
|
obj-$(CONFIG_SENSORS_ADM1026) += adm1026.o
|
|
obj-$(CONFIG_SENSORS_ADM1029) += adm1029.o
|
|
obj-$(CONFIG_SENSORS_ADM1031) += adm1031.o
|
|
obj-$(CONFIG_SENSORS_ADM9240) += adm9240.o
|
|
obj-$(CONFIG_SENSORS_ADS1015) += ads1015.o
|
|
obj-$(CONFIG_SENSORS_ADS7828) += ads7828.o
|
|
obj-$(CONFIG_SENSORS_ADS7871) += ads7871.o
|
|
obj-$(CONFIG_SENSORS_ADT7X10) += adt7x10.o
|
|
obj-$(CONFIG_SENSORS_ADT7310) += adt7310.o
|
|
obj-$(CONFIG_SENSORS_ADT7410) += adt7410.o
|
|
obj-$(CONFIG_SENSORS_ADT7411) += adt7411.o
|
|
obj-$(CONFIG_SENSORS_ADT7462) += adt7462.o
|
|
obj-$(CONFIG_SENSORS_ADT7470) += adt7470.o
|
|
obj-$(CONFIG_SENSORS_ADT7475) += adt7475.o
|
|
obj-$(CONFIG_SENSORS_APPLESMC) += applesmc.o
|
|
obj-$(CONFIG_SENSORS_ASC7621) += asc7621.o
|
|
obj-$(CONFIG_SENSORS_ATXP1) += atxp1.o
|
|
obj-$(CONFIG_SENSORS_CORETEMP) += coretemp.o
|
|
obj-$(CONFIG_SENSORS_DA9052_ADC)+= da9052-hwmon.o
|
|
obj-$(CONFIG_SENSORS_DA9055)+= da9055-hwmon.o
|
|
obj-$(CONFIG_SENSORS_DME1737) += dme1737.o
|
|
obj-$(CONFIG_SENSORS_DS620) += ds620.o
|
|
obj-$(CONFIG_SENSORS_DS1621) += ds1621.o
|
|
obj-$(CONFIG_SENSORS_EMC1403) += emc1403.o
|
|
obj-$(CONFIG_SENSORS_EMC2103) += emc2103.o
|
|
obj-$(CONFIG_SENSORS_EMC6W201) += emc6w201.o
|
|
obj-$(CONFIG_SENSORS_F71805F) += f71805f.o
|
|
obj-$(CONFIG_SENSORS_F71882FG) += f71882fg.o
|
|
obj-$(CONFIG_SENSORS_F75375S) += f75375s.o
|
|
obj-$(CONFIG_SENSORS_FAM15H_POWER) += fam15h_power.o
|
|
obj-$(CONFIG_SENSORS_FSCHMD) += fschmd.o
|
|
obj-$(CONFIG_SENSORS_G760A) += g760a.o
|
|
obj-$(CONFIG_SENSORS_GL518SM) += gl518sm.o
|
|
obj-$(CONFIG_SENSORS_GL520SM) += gl520sm.o
|
|
obj-$(CONFIG_SENSORS_GPIO_FAN) += gpio-fan.o
|
|
obj-$(CONFIG_SENSORS_HIH6130) += hih6130.o
|
|
obj-$(CONFIG_SENSORS_ULTRA45) += ultra45_env.o
|
|
obj-$(CONFIG_SENSORS_I5K_AMB) += i5k_amb.o
|
|
obj-$(CONFIG_SENSORS_IBMAEM) += ibmaem.o
|
|
obj-$(CONFIG_SENSORS_IBMPEX) += ibmpex.o
|
|
obj-$(CONFIG_SENSORS_IIO_HWMON) += iio_hwmon.o
|
|
obj-$(CONFIG_SENSORS_INA209) += ina209.o
|
|
obj-$(CONFIG_SENSORS_INA2XX) += ina2xx.o
|
|
obj-$(CONFIG_SENSORS_IT87) += it87.o
|
|
obj-$(CONFIG_SENSORS_JC42) += jc42.o
|
|
obj-$(CONFIG_SENSORS_JZ4740) += jz4740-hwmon.o
|
|
obj-$(CONFIG_SENSORS_K8TEMP) += k8temp.o
|
|
obj-$(CONFIG_SENSORS_K10TEMP) += k10temp.o
|
|
obj-$(CONFIG_SENSORS_LINEAGE) += lineage-pem.o
|
|
obj-$(CONFIG_SENSORS_LM63) += lm63.o
|
|
obj-$(CONFIG_SENSORS_LM70) += lm70.o
|
|
obj-$(CONFIG_SENSORS_LM73) += lm73.o
|
|
obj-$(CONFIG_SENSORS_LM75) += lm75.o
|
|
obj-$(CONFIG_SENSORS_LM77) += lm77.o
|
|
obj-$(CONFIG_SENSORS_LM78) += lm78.o
|
|
obj-$(CONFIG_SENSORS_LM80) += lm80.o
|
|
obj-$(CONFIG_SENSORS_LM83) += lm83.o
|
|
obj-$(CONFIG_SENSORS_LM85) += lm85.o
|
|
obj-$(CONFIG_SENSORS_LM87) += lm87.o
|
|
obj-$(CONFIG_SENSORS_LM90) += lm90.o
|
|
obj-$(CONFIG_SENSORS_LM92) += lm92.o
|
|
obj-$(CONFIG_SENSORS_LM93) += lm93.o
|
|
obj-$(CONFIG_SENSORS_LM95234) += lm95234.o
|
|
obj-$(CONFIG_SENSORS_LM95241) += lm95241.o
|
|
obj-$(CONFIG_SENSORS_LM95245) += lm95245.o
|
|
obj-$(CONFIG_SENSORS_LTC4151) += ltc4151.o
|
|
obj-$(CONFIG_SENSORS_LTC4215) += ltc4215.o
|
|
obj-$(CONFIG_SENSORS_LTC4245) += ltc4245.o
|
|
obj-$(CONFIG_SENSORS_LTC4261) += ltc4261.o
|
|
obj-$(CONFIG_SENSORS_MAX1111) += max1111.o
|
|
obj-$(CONFIG_SENSORS_MAX16065) += max16065.o
|
|
obj-$(CONFIG_SENSORS_MAX1619) += max1619.o
|
|
obj-$(CONFIG_SENSORS_MAX1668) += max1668.o
|
|
obj-$(CONFIG_SENSORS_MAX197) += max197.o
|
|
obj-$(CONFIG_SENSORS_MAX6639) += max6639.o
|
|
obj-$(CONFIG_SENSORS_MAX6642) += max6642.o
|
|
obj-$(CONFIG_SENSORS_MAX6650) += max6650.o
|
|
obj-$(CONFIG_SENSORS_MAX6697) += max6697.o
|
|
obj-$(CONFIG_SENSORS_MC13783_ADC)+= mc13783-adc.o
|
|
obj-$(CONFIG_SENSORS_MCP3021) += mcp3021.o
|
|
obj-$(CONFIG_SENSORS_NCT6775) += nct6775.o
|
|
obj-$(CONFIG_SENSORS_NTC_THERMISTOR) += ntc_thermistor.o
|
|
obj-$(CONFIG_SENSORS_PC87360) += pc87360.o
|
|
obj-$(CONFIG_SENSORS_PC87427) += pc87427.o
|
|
obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o
|
|
obj-$(CONFIG_SENSORS_S3C) += s3c-hwmon.o
|
|
obj-$(CONFIG_SENSORS_SCH56XX_COMMON)+= sch56xx-common.o
|
|
obj-$(CONFIG_SENSORS_SCH5627) += sch5627.o
|
|
obj-$(CONFIG_SENSORS_SCH5636) += sch5636.o
|
|
obj-$(CONFIG_SENSORS_SHT15) += sht15.o
|
|
obj-$(CONFIG_SENSORS_SHT21) += sht21.o
|
|
obj-$(CONFIG_SENSORS_SIS5595) += sis5595.o
|
|
obj-$(CONFIG_SENSORS_SMM665) += smm665.o
|
|
obj-$(CONFIG_SENSORS_SMSC47B397)+= smsc47b397.o
|
|
obj-$(CONFIG_SENSORS_SMSC47M1) += smsc47m1.o
|
|
obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o
|
|
obj-$(CONFIG_SENSORS_AMC6821) += amc6821.o
|
|
obj-$(CONFIG_SENSORS_THMC50) += thmc50.o
|
|
obj-$(CONFIG_SENSORS_TMP102) += tmp102.o
|
|
obj-$(CONFIG_SENSORS_TMP401) += tmp401.o
|
|
obj-$(CONFIG_SENSORS_TMP421) += tmp421.o
|
|
obj-$(CONFIG_SENSORS_TWL4030_MADC)+= twl4030-madc-hwmon.o
|
|
obj-$(CONFIG_SENSORS_VEXPRESS) += vexpress.o
|
|
obj-$(CONFIG_SENSORS_VIA_CPUTEMP)+= via-cputemp.o
|
|
obj-$(CONFIG_SENSORS_VIA686A) += via686a.o
|
|
obj-$(CONFIG_SENSORS_VT1211) += vt1211.o
|
|
obj-$(CONFIG_SENSORS_VT8231) += vt8231.o
|
|
obj-$(CONFIG_SENSORS_W83627EHF) += w83627ehf.o
|
|
obj-$(CONFIG_SENSORS_W83L785TS) += w83l785ts.o
|
|
obj-$(CONFIG_SENSORS_W83L786NG) += w83l786ng.o
|
|
obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o
|
|
obj-$(CONFIG_SENSORS_WM8350) += wm8350-hwmon.o
|
|
|
|
obj-$(CONFIG_PMBUS) += pmbus/
|
|
|
|
ccflags-$(CONFIG_HWMON_DEBUG_CHIP) := -DDEBUG
|
|
|