Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-10 23:29:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PATCH] hwmon: lm90 documentation update

Browse Source 
Update the I2C addresses for the ADM1032 and ADT7461 chips.
Also update the links to the Analog Devices web site.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Jean Delvare 2005-10-26 22:20:21 +02:00 committed by Greg Kroah-Hartman
parent c3df5806cd
commit 90209b42d0
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/hwmon/lm90
View File

@ -24,14 +24,14 @@ Supported chips:
http://www.national.com/pf/LM/LM86.html http://www.national.com/pf/LM/LM86.html
* Analog Devices ADM1032 * Analog Devices ADM1032
Prefix: 'adm1032' Prefix: 'adm1032'
Addresses scanned: I2C 0x4c Addresses scanned: I2C 0x4c and 0x4d
Datasheet: Publicly available at the Analog Devices website Datasheet: Publicly available at the Analog Devices website
http://products.analog.com/products/info.asp?product=ADM1032 http://www.analog.com/en/prod/0,2877,ADM1032,00.html
* Analog Devices ADT7461 * Analog Devices ADT7461
Prefix: 'adt7461' Prefix: 'adt7461'
Addresses scanned: I2C 0x4c Addresses scanned: I2C 0x4c and 0x4d
Datasheet: Publicly available at the Analog Devices website Datasheet: Publicly available at the Analog Devices website
http://products.analog.com/products/info.asp?product=ADT7461 http://www.analog.com/en/prod/0,2877,ADT7461,00.html
Note: Only if in ADM1032 compatibility mode Note: Only if in ADM1032 compatibility mode
* Maxim MAX6657 * Maxim MAX6657
Prefix: 'max6657' Prefix: 'max6657'

16
drivers/hwmon/lm90.c
View File

@ -31,7 +31,7 @@
* Devices. That chip is similar to the LM90, with a few differences * Devices. That chip is similar to the LM90, with a few differences
* that are not handled by this driver. Complete datasheet can be * that are not handled by this driver. Complete datasheet can be
* obtained from Analog's website at: * obtained from Analog's website at:
* http://products.analog.com/products/info.asp?product=ADM1032 * http://www.analog.com/en/prod/0,2877,ADM1032,00.html
* Among others, it has a higher accuracy than the LM90, much like the * Among others, it has a higher accuracy than the LM90, much like the
* LM86 does. * LM86 does.
* *
@ -49,7 +49,7 @@
* register values are decoded differently) it is ignored by this * register values are decoded differently) it is ignored by this
* driver. Complete datasheet can be obtained from Analog's website * driver. Complete datasheet can be obtained from Analog's website
* at: * at:
* http://products.analog.com/products/info.asp?product=ADT7461 * http://www.analog.com/en/prod/0,2877,ADT7461,00.html
* *
* Since the LM90 was the first chipset supported by this driver, most * Since the LM90 was the first chipset supported by this driver, most
* comments will refer to this chipset, but are actually general and * comments will refer to this chipset, but are actually general and
@ -83,10 +83,10 @@
* Addresses to scan * Addresses to scan
* Address is fully defined internally and cannot be changed except for * Address is fully defined internally and cannot be changed except for
* MAX6659. * MAX6659.
* LM86, LM89, LM90, LM99, ADM1032, MAX6657 and MAX6658 have address 0x4c. * LM86, LM89, LM90, LM99, ADM1032, ADM1032-1, ADT7461, MAX6657 and MAX6658
* LM89-1, and LM99-1 have address 0x4d. * have address 0x4c.
* ADM1032-2, ADT7461-2, LM89-1, and LM99-1 have address 0x4d.
* MAX6659 can have address 0x4c, 0x4d or 0x4e (unsupported). * MAX6659 can have address 0x4c, 0x4d or 0x4e (unsupported).
* ADT7461 always has address 0x4c.
*/ */
static unsigned short normal_i2c[] = { 0x4c, 0x4d, I2C_CLIENT_END }; static unsigned short normal_i2c[] = { 0x4c, 0x4d, I2C_CLIENT_END };
@ -500,14 +500,12 @@ static int lm90_detect(struct i2c_adapter *adapter, int address, int kind)
} }
} else } else
if (man_id == 0x41) { /* Analog Devices */ if (man_id == 0x41) { /* Analog Devices */
if (address == 0x4C if ((chip_id & 0xF0) == 0x40 /* ADM1032 */
&& (chip_id & 0xF0) == 0x40 /* ADM1032 */
&& (reg_config1 & 0x3F) == 0x00 && (reg_config1 & 0x3F) == 0x00
&& reg_convrate <= 0x0A) { && reg_convrate <= 0x0A) {
kind = adm1032; kind = adm1032;
} else } else
if (address == 0x4c if (chip_id == 0x51 /* ADT7461 */
&& chip_id == 0x51 /* ADT7461 */
&& (reg_config1 & 0x1F) == 0x00 /* check compat mode */ && (reg_config1 & 0x1F) == 0x00 /* check compat mode */
&& reg_convrate <= 0x0A) { && reg_convrate <= 0x0A) {
kind = adt7461; kind = adt7461;