kernel.git/drivers/hwmon/Kconfig, branch linux-3.7.y

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux into thermal

2012-10-09T05:35:52Z

Conflicts: drivers/staging/omap-thermal/omap-thermal-common. OMAP supplied dummy TC1 and TC2, at the same time that the thermal tree removed them from thermal_zone_device_register() drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c propogate the upstream MAX_IDR_LEVEL re-name to prevent a build failure Previously-fixed-by: Stephen Rothwell Signed-off-by: Len Brown

hwmon: exynos4: move thermal sensor driver to driver/thermal directory

2012-09-24T06:44:38Z

This movement is needed because the hwmon entries and corresponding sysfs interface is a duplicate of utilities already provided by driver/thermal/thermal_sys.c. The goal is to place it in thermal folder and add necessary functions to use the in-kernel thermal interfaces. Signed-off-by: Amit Daniel Kachhap Acked-by: Guenter Roeck Cc: SangWook Ju Cc: Durgadoss Cc: Len Brown Cc: Jean Delvare Cc: Kyungmin Park Cc: Kukjin Kim Signed-off-by: Andrew Morton Signed-off-by: Amit Daniel Kachhap Signed-off-by: Zhang Rui

hwmon: (mcp3021) Add MCP3221 support

2012-09-24T04:08:36Z

This Patch adds support for mcp3221 chip to the mcp3021 driver. Signed-off-by: Sven Schuchmann Signed-off-by: Guenter Roeck

hwmon: Drop dependencies on EXPERIMENTAL

2012-09-24T04:08:35Z

CONFIG_EXPERIMENTAL is expected to be removed, so drop dependencies on it. Signed-off-by: Guenter Roeck Acked-by: Greg Kroah-Hartman Acked-by: Jean Delvare

hwmon: (it87) Fix Kconfig for IT87 driver

2012-09-24T04:08:35Z

Add missing reference to IT8782F and IT8783E/F to it87 driver description in Kconfig. Replace wrong reference to Si960 with the correct Si950. Signed-off-by: Guenter Roeck Acked-by: Jean Delvare

hwmon: (ina2xx) Add support for INA220 and INA230

2012-09-24T04:08:35Z

INA220 is register compatible to INA219, and INA230 is register compatible to INA226, so all we need to do is to add name aliases for those two chips. Cc: Lothar Felten Signed-off-by: Guenter Roeck Reviewed-by: Jean Delvare

hwmon: (max1111) Add support for MAX1110, MAX1112, and MAX1113

2012-09-24T04:08:34Z

MAX1110 is similar to MAX1111, with 8 instead of 4 channels. MAX1112 and MAX1113 are similar to MAX1110 and MAX1111, with 4.096V reference voltage instead of 2.048V. Signed-off-by: Guenter Roeck Acked-by: Jean Delvare

hwmon: (lm70) Add support for LM71 and LM74

2012-09-24T04:08:34Z

Add support for LM74 and LM71 to LM70 driver. Signed-off-by: Christophe Leroy Signed-off-by: Guenter Roeck

hwmon: add Maxim MAX197 support

2012-09-24T04:08:33Z

The MAX197 is an A/D converter, made by Maxim. This driver currently supports the MAX197, and MAX199. They are both 8-Channel, Multi-Range, 5V, 12-Bit DAS with 8+4 Bus Interface and Fault Protection. The available ranges for the MAX197 are {0,-5V} to 5V, and {0,-10V} to 10V, while they are {0,-2V} to 2V, and {0,-4V} to 4V on the MAX199. Signed-off-by: Vivien Didelot Signed-off-by: Guenter Roeck

hwmon: Driver for ADT7410

2012-09-24T04:08:33Z

This patch brings basic support for the Analog Devices ADT7410 temperature sensor. The following functionality has been implemented: * get current temperature * get/set minimum, maximum and critical temperature * get/set hysteresis * get alarm events for minimum, maximum and critical temperature All implemented sysfs attributes have been sucessfully tested at temperatures of 15°C to 40°C. Signed-off-by: Hartmut Knaack Signed-off-by: Guenter Roeck