summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'hwmon-for-linus' of ↵Linus Torvalds2014-06-0335-1417/+2885
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging into next Pull hwmon updates from Guenter Roeck: "New driver for NCT6683D New chip support to existing drivers: - add support for STTS2004 and AT30TSE004 to jc42 driver - add support for EMC1402/EMC1412/EMC1422 to emc1403 driver Other notable changes: - document hwmon kernel API - convert jc42, lm70, lm75, lm77, lm83, lm92, max1619, tmp421, and tmp102 drivers to use new hwmon API functions - replace function macros in lm80, lm92, and jc42 drivers with real code - convert emc1403 driver to use regmap, add support for additional attributes, and add device IDs for EMC1412, EMC1413, and EMC1414 - various additional cleanup and minor bug fixes in several drivers" * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (60 commits) hwmon: (nct6775) Fix probe unwind paths to properly unregister platform devices hwmon: (nct6683) Fix probe unwind paths to properly unregister platform devices hwmon: (ultra45_env) Introduce managed version of kzalloc hwmon: Driver for NCT6683D hwmon: (lm80) Rearrange code to avoid forward declarations hwmon: (lm80) Convert fan display function macros into functions hwmon: (lm80) Convert voltage display function macros into functions hwmon: (lm80) Convert temperature display function macros into functions hwmon: (lm80) Normalize all temperature values to 16 bit hwmon: (lm80) Simplify TEMP_FROM_REG hwmon: (lm83) Convert to use devm_hwmon_device_register_with_groups hwmon: (lm83) Rearange code to avoid forward declarations hwmon: (lm83) Drop FSF address hwmon: (max1619) Convert to use devm_hwmon_device_register_with_groups hwmon: (max1619) Drop function macros hwmon: (max1619) Rearrange code to avoid forward declarations hwmon: (max1619) Drop FSF address hwmon: (max1619) Fix critical alarm display hwmon: (jc42) Add support for STTS2004 and AT30TSE004 hwmon: (jc42) Convert function macros into functions ...
| * hwmon: (nct6775) Fix probe unwind paths to properly unregister platform devicesAxel Lin2014-05-241-3/+5
| | | | | | | | | | | | | | | | Call platform_device_unregister() rather than platform_device_put() to unregister successfully registered platform devices. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (nct6683) Fix probe unwind paths to properly unregister platform devicesAxel Lin2014-05-241-3/+5
| | | | | | | | | | | | | | | | Call platform_device_unregister() rather than platform_device_put() to unregister successfully registered platform devices. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (ultra45_env) Introduce managed version of kzallocHimangi Saraogi2014-05-211-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch moves data allocated using kzalloc to managed data allocated using devm_kzalloc and cleans now unnecessary kfrees in probe and remove functions. Also, the unnecessary label out_free is removed. The following Coccinelle semantic patch was used for making the change: @platform@ identifier p, probefn, removefn; @@ struct platform_driver p = { .probe = probefn, .remove = removefn, }; @prb@ identifier platform.probefn, pdev; expression e, e1, e2; @@ probefn(struct platform_device *pdev, ...) { <+... - e = kzalloc(e1, e2) + e = devm_kzalloc(&pdev->dev, e1, e2) ... ?-kfree(e); ...+> } @rem depends on prb@ identifier platform.removefn; expression e; @@ removefn(...) { <... - kfree(e); ...> } Signed-off-by: Himangi Saraogi <himangi774@gmail.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: Driver for NCT6683DGuenter Roeck2014-05-214-0/+1523
| | | | | | | | | | | | Nuvoton NCT6683D is an eSIO with hardware monitoring capabilities. Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (lm80) Rearrange code to avoid forward declarationsGuenter Roeck2014-05-211-151/+139
| | | | | | | | | | | | | | | | Avoid need for forward declarations by rearranging code. No functional change. Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (lm80) Convert fan display function macros into functionsGuenter Roeck2014-05-211-34/+41
| | | | | | | | | | | | | | | | | | Convert fan display function macros into functions to reduce code size and improve code readability. Code size reduction is about 200 bytes on x86_64. Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (lm80) Convert voltage display function macros into functionsGuenter Roeck2014-05-211-72/+76
| | | | | | | | | | | | | | | | | | Convert voltage display function macros into functions to reduce code size and improve code readability. Code size reduction is about 600 bytes on x86_64. Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (lm80) Convert temperature display function macros into functionsGuenter Roeck2014-05-211-75/+59
| | | | | | | | | | | | | | | | | | Convert temperature display function macros into functions to reduce code size and improve code readability. Code size reduction is about 2k on x86_64. Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (lm80) Normalize all temperature values to 16 bitGuenter Roeck2014-05-211-18/+14
| | | | | | | | | | | | | | Normalize all stored temperature values to 16 bit to simplify temperature calculations. Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (lm80) Simplify TEMP_FROM_REGGuenter Roeck2014-05-211-14/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | TEMP_FROM_REG gets 12 bits of temperature data in the upper 12 bit of a signed 16 bit parameter, with the integer part (including sign) in the upper 8 bit and the remainder in bit 4..7. The lower 4 bit of the 16 bit data is always 0. We can use that information to convert the temperature directly into display data (1/1000th of degree C). Note that the stored temperature data is not shifted right as the comment claimed, so remove that misleading comment. Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (lm83) Convert to use devm_hwmon_device_register_with_groupsGuenter Roeck2014-05-211-43/+16
| | | | | | | | | | | | | | Use devm_hwmon_device_register_with_groups API to attach attributes to hwmon device, simplify code, and reduce code size. Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (lm83) Rearange code to avoid forward declarationsGuenter Roeck2014-05-211-61/+50
| | | | | | | | | | | | | | Avoid forward declarations by rearranging code. No functional change. Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (lm83) Drop FSF addressGuenter Roeck2014-05-211-4/+0
| | | | | | | | | | | | The FSF address changes over time, so drop it. Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (max1619) Convert to use devm_hwmon_device_register_with_groupsGuenter Roeck2014-05-211-39/+14
| | | | | | | | | | | | | | Use devm_hwmon_device_register_with_groups API to attach attributes to hwmon device, simplify code, and reduce code size. Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (max1619) Drop function macrosGuenter Roeck2014-05-211-68/+73
| | | | | | | | | | | | | | Function macros make the code larger and difficult ro read. Drop them and reduce code size (on x86_64) by ~1800 bytes. Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (max1619) Rearrange code to avoid forward declarationsGuenter Roeck2014-05-211-89/+69
| | | | | | | | | | | | | | | | | | Forward declarations are unnecessary and easy to avoid, so rearrange code and drop them. No functional change. Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (max1619) Drop FSF addressGuenter Roeck2014-05-211-5/+0
| | | | | | | | | | | | The FSF address may chance over time, so drop it. Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (max1619) Fix critical alarm displayGuenter Roeck2014-05-211-0/+5
| | | | | | | | | | | | | | | | | | The overtemperature status bit, which is used to display critical alarm status, matches the output of the OVERT signal 1:1. If that signal is active-low, the bit will read 1 if there is no alarm. It is therefore necessary to reverse the bit in this case. Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (jc42) Add support for STTS2004 and AT30TSE004Guenter Roeck2014-05-212-6/+19
| | | | | | | | | | | | | | Also fix links to datasheets for other supported sensors from ST Microelectronics, and add links to several Atmel datasheets. Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (jc42) Convert function macros into functionsGuenter Roeck2014-05-211-110/+72
| | | | | | | | | | | | | | Convert function macros into functions to make the code easier to read and reduce code size. Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (jc42) Rearrange code to avoid forward declarationsGuenter Roeck2014-05-211-97/+89
| | | | | | | | Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (emc1403) Add device IDs for EMC1412, EMC1413, and EMC1414Guenter Roeck2014-05-211-0/+3
| | | | | | | | | | | | | | | | | | EMC1412, EMC1413, and EMC1414 are fully compatible to EMC1402, EMC1403, and EMC1404, and even report the same chip ID. Add to device ID table to enable instantiation with correct chip names. Reviewed-by: Jean Delvare <jdelvare@suse.de> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (emc1403) Add support for min_hyst attributesGuenter Roeck2014-05-211-3/+24
| | | | | | | | | | | | | | The hysteresis value applies to all limits, so add support for tempX_min_hyst. Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (emc1403) Add support for max_hyst attributesGuenter Roeck2014-05-211-0/+8
| | | | | | | | | | | | | | The hysteresis value applies to all limits, so add support for tempX_max_hyst. Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (emc1403) Relax hysteresis limit write checksGuenter Roeck2014-05-211-6/+1
| | | | | | | | | | | | | | | | | | Writing the hysteresis limit returned -ERANGE if the written hysteresis was too high or too low. Relax error check and adjust the hysteresis value to its valid range. Reviewed-by: Jean Delvare <jdelvare@suse.de> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (emc1403) Make all hyst attributes except for temp1_crit_hyst read-onlyGuenter Roeck2014-05-212-8/+8
| | | | | | | | | | | | | | | | | | | | All chips in this chip series only support a single hysteresis value. Having multiple writable hysteresis attributes is therefore confusing, since a single write affects all hysteresis temperatures. Make all but one (temp1_crit_hyst) read-only. Reviewed-by: Jean Delvare <jdelvare@suse.de> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (emc1403) Add support for alarm and diode fault status on EMC14x2Guenter Roeck2014-05-211-0/+36
| | | | | | | | | | | | | | Alarm and fault status register on EMC1402, EMC1412, and EMC1422 is reported in a different register than with other chips. Add support for it. Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (emc1403) Report external diode fault statusGuenter Roeck2014-05-211-0/+6
| | | | | | | | Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (emc1403) Convert to use regmapGuenter Roeck2014-05-211-54/+63
| | | | | | | | | | | | Convert to regmap to be able to use its register caching mechanism. Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (emc1403) Add driver documentationGuenter Roeck2014-05-211-0/+56
| | | | | | | | | | | | | | With the driver now supporting several chip variants, it is about time to document what is supported. Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: Document hwmon kernel APIGuenter Roeck2014-05-211-0/+107
| | | | | | | | | | | | | | | | The hwmon subsystem has been around for a while. Time to document its kernel API. Acked-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (emc1403) Add support for emc14x2Josef Gajdusek2014-05-211-15/+43
| | | | | | | | | | | | | | | | | | | | Add support for emc1402/emc1412/emc1422 temperature monitoring chips. This line of sensors only has 2 temperature channels (internal and external) in comparison to the emc14x3 (3 channels) and emc14x4 (4 channels). Signed-off-by: Josef Gajdusek <atx@atx.name> [Guenter Roeck: ordered i2c address list, updated description/headline] Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (adm1029) Update Corentin Labbe's emailLABBE Corentin2014-05-211-2/+2
| | | | | | | | | | Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * MAINTAINERS: Update Corentin Labbe's emailLABBE Corentin2014-05-211-1/+1
| | | | | | | | | | Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (iio_hwmon) Make of_device_id array constJingoo Han2014-05-211-1/+1
| | | | | | | | | | | | | | | | Make of_device_id array const, because all OF functions handle it as const. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (gpio-fan) Make of_device_id array constJingoo Han2014-05-211-1/+1
| | | | | | | | | | | | | | | | Make of_device_id array const, because all OF functions handle it as const. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (g762) Make of_device_id array constJingoo Han2014-05-211-1/+1
| | | | | | | | | | | | | | | | Make of_device_id array const, because all OF functions handle it as const. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (ltc2945) Fix 1st comment lineGuenter Roeck2014-05-211-1/+1
| | | | | | | | | | | | | | Somehow a couple of spaces got added to the first line. Remove them. No code change. Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (vt1211) remove unnecessary OOM messagesJingoo Han2014-05-211-3/+1
| | | | | | | | | | | | | | | | | | The site-specific OOM messages are unnecessary, because they duplicate the MM subsystem generic OOM message. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Acked-by: Jean Delvare <jdelvare@suse.de> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (s3c-hwmon) remove unnecessary OOM messagesJingoo Han2014-05-211-3/+1
| | | | | | | | | | | | | | | | | | The site-specific OOM messages are unnecessary, because they duplicate the MM subsystem generic OOM message. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Acked-by: Jean Delvare <jdelvare@suse.de> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (pc87427) remove unnecessary OOM messagesJingoo Han2014-05-211-3/+1
| | | | | | | | | | | | | | | | | | The site-specific OOM messages are unnecessary, because they duplicate the MM subsystem generic OOM message. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Acked-by: Jean Delvare <jdelvare@suse.de> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (max197) remove unnecessary OOM messagesJingoo Han2014-05-211-3/+1
| | | | | | | | | | | | | | | | | | The site-specific OOM messages are unnecessary, because they duplicate the MM subsystem generic OOM message. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Acked-by: Jean Delvare <jdelvare@suse.de> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (max1111) remove unnecessary OOM messagesJingoo Han2014-05-211-3/+1
| | | | | | | | | | | | | | | | | | The site-specific OOM messages are unnecessary, because they duplicate the MM subsystem generic OOM message. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Acked-by: Jean Delvare <jdelvare@suse.de> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (lm93) remove unnecessary OOM messagesJingoo Han2014-05-211-3/+1
| | | | | | | | | | | | | | | | | | The site-specific OOM messages are unnecessary, because they duplicate the MM subsystem generic OOM message. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Acked-by: Jean Delvare <jdelvare@suse.de> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (ibmpex) remove unnecessary OOM messagesJingoo Han2014-05-211-3/+1
| | | | | | | | | | | | | | | | | | | | The site-specific OOM messages are unnecessary, because they duplicate the MM subsystem generic OOM message. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Acked-by: Jean Delvare <jdelvare@suse.de> Acked-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (f71805f) remove unnecessary OOM messagesJingoo Han2014-05-211-3/+1
| | | | | | | | | | | | | | | | | | The site-specific OOM messages are unnecessary, because they duplicate the MM subsystem generic OOM message. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Acked-by: Jean Delvare <jdelvare@suse.de> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (lm92) Convert to use devm_hwmon_device_register_with_groupsGuenter Roeck2014-05-211-41/+15
| | | | | | | | | | | | | | | | Use devm_hwmon_device_register_with_groups API to attach attributes to hwmon device, simplify code, and reduce code size. Reviewed-by: Jean Delvare <jdelvare@suse.de> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (lm92) Drop function macrosGuenter Roeck2014-05-211-83/+84
| | | | | | | | | | | | | | Function macros obfuscate code and increase code size, so drop them. Reviewed-by: Jean Delvare <jdelvare@suse.de> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| * hwmon: (lm92) Drop FSF mailing addressGuenter Roeck2014-05-211-4/+0
| | | | | | | | | | | | | | The FSF mailing address may change, so drop it. Reviewed-by: Jean Delvare <jdelvare@suse.de> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
OpenPOWER on IntegriCloud