diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-11 05:55:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-11 05:55:04 -0400 |
| commit | a0f0dd57f4a85310d9936f1770a0424b49fef876 (patch) | |
| tree | 2f85b8b67dda13d19b02ca39e0fbef921cb1cf8b /Documentation/hwmon/mcp3021 | |
| parent | 2a552d5e63d7fa602c9a9a0717008737f55625a6 (diff) | |
| parent | 846a136881b8f73c1f74250bf6acfaa309cab1f2 (diff) | |
Merge branch 'fixes' into for-linus
Conflicts:
arch/arm/kernel/smp.c
Diffstat (limited to 'Documentation/hwmon/mcp3021')
| -rw-r--r-- | Documentation/hwmon/mcp3021 | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/Documentation/hwmon/mcp3021 b/Documentation/hwmon/mcp3021 index 325fd87e81b2..74a6b72adf5f 100644 --- a/Documentation/hwmon/mcp3021 +++ b/Documentation/hwmon/mcp3021 | |||
| @@ -5,18 +5,25 @@ Supported chips: | |||
| 5 | * Microchip Technology MCP3021 | 5 | * Microchip Technology MCP3021 |
| 6 | Prefix: 'mcp3021' | 6 | Prefix: 'mcp3021' |
| 7 | Datasheet: http://ww1.microchip.com/downloads/en/DeviceDoc/21805a.pdf | 7 | Datasheet: http://ww1.microchip.com/downloads/en/DeviceDoc/21805a.pdf |
| 8 | * Microchip Technology MCP3221 | ||
| 9 | Prefix: 'mcp3221' | ||
| 10 | Datasheet: http://ww1.microchip.com/downloads/en/DeviceDoc/21732c.pdf | ||
| 8 | 11 | ||
| 9 | Author: Mingkai Hu | 12 | Authors: |
| 13 | Mingkai Hu | ||
| 14 | Sven Schuchmann <schuchmann@schleissheimer.de> | ||
| 10 | 15 | ||
| 11 | Description | 16 | Description |
| 12 | ----------- | 17 | ----------- |
| 13 | 18 | ||
| 14 | This driver implements support for the Microchip Technology MCP3021 chip. | 19 | This driver implements support for the Microchip Technology MCP3021 and |
| 20 | MCP3221 chip. | ||
| 15 | 21 | ||
| 16 | The Microchip Technology Inc. MCP3021 is a successive approximation A/D | 22 | The Microchip Technology Inc. MCP3021 is a successive approximation A/D |
| 17 | converter (ADC) with 10-bit resolution. | 23 | converter (ADC) with 10-bit resolution. The MCP3221 has 12-bit resolution. |
| 18 | This device provides one single-ended input with very low power consumption. | 24 | |
| 19 | Communication to the MCP3021 is performed using a 2-wire I2C compatible | 25 | These devices provide one single-ended input with very low power consumption. |
| 20 | interface. Standard (100 kHz) and Fast (400 kHz) I2C modes are available. | 26 | Communication to the MCP3021/MCP3221 is performed using a 2-wire I2C |
| 21 | The default I2C device address is 0x4d (contact the Microchip factory for | 27 | compatible interface. Standard (100 kHz) and Fast (400 kHz) I2C modes are |
| 22 | additional address options). | 28 | available. The default I2C device address is 0x4d (contact the Microchip |
| 29 | factory for additional address options). | ||