Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc803a75 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add INA231 for MSM8996 fluid"

parents 47c35d25 31f1457f

Documentation/devicetree/bindings/i2c/ina2xx.txt

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ Required properties: 
	- "ti,ina220" for ina220

	- "ti,ina226" for ina226

	- "ti,ina230" for ina230

	- "ti,ina231" for ina231

- reg: I2C address



Optional properties:

Documentation/hwmon/ina2xx

+9 −0
Original line number Diff line number Diff line
@@ -26,6 +26,12 @@ Supported chips: 
    Datasheet: Publicly available at the Texas Instruments website

               http://www.ti.com/



  * Texas Instruments INA231

    Prefix: 'ina231'

    Addresses: I2C 0x40 - 0x4f

    Datasheet: Publicly available at the Texas Instruments website

               http://www.ti.com/



Author: Lothar Felten <l-felten@ti.com>



Description
@@ -44,6 +50,9 @@ The INA226 monitors both a shunt voltage drop and bus supply voltage. 
The INA230 is a high or low side current shunt and power monitor with an I2C

interface. The INA230 monitors both a shunt voltage drop and bus supply voltage.



The INA231 is a high or low side current shunt and power monitor with an I2C

interface. The INA231 monitors both a shunt voltage drop and bus supply voltage.



The shunt value in micro-ohms can be set via platform data or device tree.

Please refer to the Documentation/devicetree/bindings/i2c/ina2xx.txt for bindings

if the device tree is used.

arch/arm/boot/dts/qcom/msm8996-fluid.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -40,6 +40,12 @@ 
		qcom,float-voltage-mv = <4400>;

		qcom,recharge-mv = <100>;

	};



	ina231@40 {

		compatible = "ina231";

		reg = <0x40>;

		shunt-resistor = <5000>;

	};

};



&ufs_ice {

drivers/hwmon/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -1436,8 +1436,8 @@ config SENSORS_INA2XX 
	tristate "Texas Instruments INA219 and compatibles"

	depends on I2C

	help

	  If you say yes here you get support for INA219, INA220, INA226, and

	  INA230 power monitor chips.

	  If you say yes here you get support for INA219, INA220, INA226,

	  INA230 and INA231 power monitor chips.



	  The INA2xx driver is configured for the default configuration of

	  the part as described in the datasheet.

drivers/hwmon/ina2xx.c

+1 −0
Original line number Diff line number Diff line
@@ -273,6 +273,7 @@ static const struct i2c_device_id ina2xx_id[] = { 
	{ "ina220", ina219 },

	{ "ina226", ina226 },

	{ "ina230", ina226 },

	{ "ina231", ina226 },

	{ }

};

MODULE_DEVICE_TABLE(i2c, ina2xx_id);