diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-09 23:34:41 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-09 23:34:41 +0300 |
| commit | 5c30c3cc6d5de71f1248875e9213e6c109dda963 (patch) | |
| tree | 79b81eeeb3f2bdce2c8a5e0dc853ef6026d3fad7 /Documentation | |
| parent | 19acc77a36970958a4a0e4daeb2c8cb2aab0ffd4 (diff) | |
| parent | dd378b1bcaa0ef5b14cca1e52b58ef9a3279fd8b (diff) | |
| download | linux-5c30c3cc6d5de71f1248875e9213e6c109dda963.tar.xz | |
Merge tag 'hwmon-for-linus-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck:
"Explicit support for ina231 added to ina2xx driver.
Minor improvements, cleanup and fixes in various drivers"
* tag 'hwmon-for-linus-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (tmp102) add hibernation callbacks
hwmon: (ads2828) Only keep data in device data structure if needed
hwmon: (ads2828) Convert to use regmap
hwmon: (jc42) Allow negative hysteresis temperatures
hwmon: (adc128d818) Do proper sign extension
hwmon: (ad7314) Do proper sign extension
hwmon: (abx500) Fix format string warnings
hwmon: (jc42) Fix integer overflow when writing hysteresis value
hwmon: (jc42) Fix integer overflow
hwmon: (jc42) Use sign_extend32 for sign extension
hwmon: (ina2xx) Add ina231 compatible string
hwmon: (ina2xx) use DIV_ROUND_CLOSEST() to avoid rounding errors
hwmon: (ina2xx) remove an unnecessary dev_get_drvdata() result check
hwmon: (ina2xx) implement update_interval attribute for ina226
hwmon: (ina2xx) make shunt resistance configurable at run-time
hwmon: (ina2xx) don't accept shunt values greater than the calibration factor
hwmon: (ina2xx) remove a stray new line
hwmon: (ina2xx) reinitialize the chip in case it's been reset
hwmon: (nct7802) Constify struct regmap_config
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/hwmon/ina2xx | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/Documentation/hwmon/ina2xx b/Documentation/hwmon/ina2xx index 4223c2d3b508..cfd31d94c872 100644 --- a/Documentation/hwmon/ina2xx +++ b/Documentation/hwmon/ina2xx @@ -26,6 +26,12 @@ Supported chips: Datasheet: Publicly available at the Texas Instruments website http://www.ti.com/ + * Texas Instruments INA231 + Prefix: 'ina231' + Addresses: I2C 0x40 - 0x4f + Datasheet: Publicly available at the Texas Instruments website + http://www.ti.com/ + Author: Lothar Felten <l-felten@ti.com> Description @@ -41,9 +47,18 @@ interface. The INA220 monitors both shunt drop and supply voltage. The INA226 is a current shunt and power monitor with an I2C interface. The INA226 monitors both a shunt voltage drop and bus supply voltage. -The INA230 is a high or low side current shunt and power monitor with an I2C -interface. The INA230 monitors both a shunt voltage drop and bus supply voltage. +INA230 and INA231 are high or low side current shunt and power monitors +with an I2C interface. The chips monitor both a shunt voltage drop and +bus supply voltage. -The shunt value in micro-ohms can be set via platform data or device tree. -Please refer to the Documentation/devicetree/bindings/i2c/ina2xx.txt for bindings +The shunt value in micro-ohms can be set via platform data or device tree at +compile-time or via the shunt_resistor attribute in sysfs at run-time. Please +refer to the Documentation/devicetree/bindings/i2c/ina2xx.txt for bindings if the device tree is used. + +Additionally ina226 supports update_interval attribute as described in +Documentation/hwmon/sysfs-interface. Internally the interval is the sum of +bus and shunt voltage conversion times multiplied by the averaging rate. We +don't touch the conversion times and only modify the number of averages. The +lower limit of the update_interval is 2 ms, the upper limit is 2253 ms. +The actual programmed interval may vary from the desired value. |