aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/hwmon/ina2xx18
-rw-r--r--drivers/hwmon/Kconfig6
-rw-r--r--drivers/hwmon/ina2xx.c10
3 files changed, 31 insertions, 3 deletions
diff --git a/Documentation/hwmon/ina2xx b/Documentation/hwmon/ina2xx
index f50a6cc27616..03444f9d833f 100644
--- a/Documentation/hwmon/ina2xx
+++ b/Documentation/hwmon/ina2xx
@@ -8,12 +8,24 @@ Supported chips:
8 Datasheet: Publicly available at the Texas Instruments website 8 Datasheet: Publicly available at the Texas Instruments website
9 http://www.ti.com/ 9 http://www.ti.com/
10 10
11 * Texas Instruments INA220
12 Prefix: 'ina220'
13 Addresses: I2C 0x40 - 0x4f
14 Datasheet: Publicly available at the Texas Instruments website
15 http://www.ti.com/
16
11 * Texas Instruments INA226 17 * Texas Instruments INA226
12 Prefix: 'ina226' 18 Prefix: 'ina226'
13 Addresses: I2C 0x40 - 0x4f 19 Addresses: I2C 0x40 - 0x4f
14 Datasheet: Publicly available at the Texas Instruments website 20 Datasheet: Publicly available at the Texas Instruments website
15 http://www.ti.com/ 21 http://www.ti.com/
16 22
23 * Texas Instruments INA230
24 Prefix: 'ina230'
25 Addresses: I2C 0x40 - 0x4f
26 Datasheet: Publicly available at the Texas Instruments website
27 http://www.ti.com/
28
17Author: Lothar Felten <l-felten@ti.com> 29Author: Lothar Felten <l-felten@ti.com>
18 30
19Description 31Description
@@ -23,7 +35,13 @@ The INA219 is a high-side current shunt and power monitor with an I2C
23interface. The INA219 monitors both shunt drop and supply voltage, with 35interface. The INA219 monitors both shunt drop and supply voltage, with
24programmable conversion times and filtering. 36programmable conversion times and filtering.
25 37
38The INA220 is a high or low side current shunt and power monitor with an I2C
39interface. The INA220 monitors both shunt drop and supply voltage.
40
26The INA226 is a current shunt and power monitor with an I2C interface. 41The INA226 is a current shunt and power monitor with an I2C interface.
27The INA226 monitors both a shunt voltage drop and bus supply voltage. 42The INA226 monitors both a shunt voltage drop and bus supply voltage.
28 43
44The INA230 is a high or low side current shunt and power monitor with an I2C
45interface. The INA230 monitors both a shunt voltage drop and bus supply voltage.
46
29The shunt value in micro-ohms can be set via platform data. 47The shunt value in micro-ohms can be set via platform data.
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 41e311386e89..86adde90c1bb 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -1145,11 +1145,11 @@ config SENSORS_AMC6821
1145 will be called amc6821. 1145 will be called amc6821.
1146 1146
1147config SENSORS_INA2XX 1147config SENSORS_INA2XX
1148 tristate "Texas Instruments INA219, INA226" 1148 tristate "Texas Instruments INA219 and compatibles"
1149 depends on I2C && EXPERIMENTAL 1149 depends on I2C && EXPERIMENTAL
1150 help 1150 help
1151 If you say yes here you get support for INA219 and INA226 power 1151 If you say yes here you get support for INA219, INA220, INA226, and
1152 monitor chips. 1152 INA230 power monitor chips.
1153 1153
1154 The INA2xx driver is configured for the default configuration of 1154 The INA2xx driver is configured for the default configuration of
1155 the part as described in the datasheet. 1155 the part as described in the datasheet.
diff --git a/drivers/hwmon/ina2xx.c b/drivers/hwmon/ina2xx.c
index de8f2c6c6b66..70717d4a5e89 100644
--- a/drivers/hwmon/ina2xx.c
+++ b/drivers/hwmon/ina2xx.c
@@ -5,10 +5,18 @@
5 * Zero Drift Bi-Directional Current/Power Monitor with I2C Interface 5 * Zero Drift Bi-Directional Current/Power Monitor with I2C Interface
6 * Datasheet: http://www.ti.com/product/ina219 6 * Datasheet: http://www.ti.com/product/ina219
7 * 7 *
8 * INA220:
9 * Bi-Directional Current/Power Monitor with I2C Interface
10 * Datasheet: http://www.ti.com/product/ina220
11 *
8 * INA226: 12 * INA226:
9 * Bi-Directional Current/Power Monitor with I2C Interface 13 * Bi-Directional Current/Power Monitor with I2C Interface
10 * Datasheet: http://www.ti.com/product/ina226 14 * Datasheet: http://www.ti.com/product/ina226
11 * 15 *
16 * INA230:
17 * Bi-directional Current/Power Monitor with I2C Interface
18 * Datasheet: http://www.ti.com/product/ina230
19 *
12 * Copyright (C) 2012 Lothar Felten <l-felten@ti.com> 20 * Copyright (C) 2012 Lothar Felten <l-felten@ti.com>
13 * Thanks to Jan Volkering 21 * Thanks to Jan Volkering
14 * 22 *
@@ -277,7 +285,9 @@ static int ina2xx_remove(struct i2c_client *client)
277 285
278static const struct i2c_device_id ina2xx_id[] = { 286static const struct i2c_device_id ina2xx_id[] = {
279 { "ina219", ina219 }, 287 { "ina219", ina219 },
288 { "ina220", ina219 },
280 { "ina226", ina226 }, 289 { "ina226", ina226 },
290 { "ina230", ina226 },
281 { } 291 { }
282}; 292};
283MODULE_DEVICE_TABLE(i2c, ina2xx_id); 293MODULE_DEVICE_TABLE(i2c, ina2xx_id);