aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/hwmon/ina2xx11
-rw-r--r--drivers/hwmon/Kconfig4
-rw-r--r--drivers/hwmon/ina2xx.c1
3 files changed, 12 insertions, 4 deletions
diff --git a/Documentation/hwmon/ina2xx b/Documentation/hwmon/ina2xx
index 450e3ccd983d..cfd31d94c872 100644
--- a/Documentation/hwmon/ina2xx
+++ b/Documentation/hwmon/ina2xx
@@ -26,6 +26,12 @@ Supported chips:
26 Datasheet: Publicly available at the Texas Instruments website 26 Datasheet: Publicly available at the Texas Instruments website
27 http://www.ti.com/ 27 http://www.ti.com/
28 28
29 * Texas Instruments INA231
30 Prefix: 'ina231'
31 Addresses: I2C 0x40 - 0x4f
32 Datasheet: Publicly available at the Texas Instruments website
33 http://www.ti.com/
34
29Author: Lothar Felten <l-felten@ti.com> 35Author: Lothar Felten <l-felten@ti.com>
30 36
31Description 37Description
@@ -41,8 +47,9 @@ interface. The INA220 monitors both shunt drop and supply voltage.
41The INA226 is a current shunt and power monitor with an I2C interface. 47The INA226 is a current shunt and power monitor with an I2C interface.
42The INA226 monitors both a shunt voltage drop and bus supply voltage. 48The INA226 monitors both a shunt voltage drop and bus supply voltage.
43 49
44The INA230 is a high or low side current shunt and power monitor with an I2C 50INA230 and INA231 are high or low side current shunt and power monitors
45interface. The INA230 monitors both a shunt voltage drop and bus supply voltage. 51with an I2C interface. The chips monitor both a shunt voltage drop and
52bus supply voltage.
46 53
47The shunt value in micro-ohms can be set via platform data or device tree at 54The shunt value in micro-ohms can be set via platform data or device tree at
48compile-time or via the shunt_resistor attribute in sysfs at run-time. Please 55compile-time or via the shunt_resistor attribute in sysfs at run-time. Please
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index a7de26d1ac80..c24394086b40 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -1430,8 +1430,8 @@ config SENSORS_INA2XX
1430 tristate "Texas Instruments INA219 and compatibles" 1430 tristate "Texas Instruments INA219 and compatibles"
1431 depends on I2C 1431 depends on I2C
1432 help 1432 help
1433 If you say yes here you get support for INA219, INA220, INA226, and 1433 If you say yes here you get support for INA219, INA220, INA226,
1434 INA230 power monitor chips. 1434 INA230, and INA231 power monitor chips.
1435 1435
1436 The INA2xx driver is configured for the default configuration of 1436 The INA2xx driver is configured for the default configuration of
1437 the part as described in the datasheet. 1437 the part as described in the datasheet.
diff --git a/drivers/hwmon/ina2xx.c b/drivers/hwmon/ina2xx.c
index 611ec4edd979..d1542b7d4bc3 100644
--- a/drivers/hwmon/ina2xx.c
+++ b/drivers/hwmon/ina2xx.c
@@ -538,6 +538,7 @@ static const struct i2c_device_id ina2xx_id[] = {
538 { "ina220", ina219 }, 538 { "ina220", ina219 },
539 { "ina226", ina226 }, 539 { "ina226", ina226 },
540 { "ina230", ina226 }, 540 { "ina230", ina226 },
541 { "ina231", ina226 },
541 { } 542 { }
542}; 543};
543MODULE_DEVICE_TABLE(i2c, ina2xx_id); 544MODULE_DEVICE_TABLE(i2c, ina2xx_id);