diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 19:35:10 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 19:35:10 -0500 |
commit | 16cd9d1c0f149ee0c8073de037e7c57886234aa0 (patch) | |
tree | 8d9f08b1043b3e08eefbe46ceea7a5ea56380335 /Documentation/hwmon | |
parent | f412f2c60b480fa5140a4b4cb321cd48c64e1812 (diff) | |
parent | aae7bce48176d5ffa4ccd4dbdb861488db892837 (diff) |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull hwmon fixes and updates from Jean Delvare:
"All lm90 driver fixes and improvements"
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
Documentation: dt: hwmon: Add OF document for LM90
hwmon: (lm90) Add power control
hwmon: (lm90) Add support for TI TMP451
hwmon: (lm90) Use enums for the indexes of temp8 and temp11
hwmon: (lm90) Add support to handle IRQ
hwmon: (lm90) Define status bits
hwmon: (lm90) Fix max6696 alarm handling
Diffstat (limited to 'Documentation/hwmon')
-rw-r--r-- | Documentation/hwmon/lm90 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/hwmon/lm90 b/Documentation/hwmon/lm90 index b466974e142f..ab81013cc390 100644 --- a/Documentation/hwmon/lm90 +++ b/Documentation/hwmon/lm90 | |||
@@ -122,6 +122,12 @@ Supported chips: | |||
122 | Prefix: 'g781' | 122 | Prefix: 'g781' |
123 | Addresses scanned: I2C 0x4c, 0x4d | 123 | Addresses scanned: I2C 0x4c, 0x4d |
124 | Datasheet: Not publicly available from GMT | 124 | Datasheet: Not publicly available from GMT |
125 | * Texas Instruments TMP451 | ||
126 | Prefix: 'tmp451' | ||
127 | Addresses scanned: I2C 0x4c | ||
128 | Datasheet: Publicly available at TI website | ||
129 | http://www.ti.com/litv/pdf/sbos686 | ||
130 | |||
125 | 131 | ||
126 | Author: Jean Delvare <khali@linux-fr.org> | 132 | Author: Jean Delvare <khali@linux-fr.org> |
127 | 133 | ||