diff options
| author |   Rob Herring <robh@kernel.org> | 2015-09-25 23:37:27 -0500 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2015-10-22 09:21:24 -0500 |
| commit | 62bc9f15e443c3ca02e47f13f339bd7993ae1e65 (patch) | |
| tree | e458d7f13197db1d6b35afc68cb5fdd90b083141 /Documentation/devicetree/bindings/hwmon | |
| parent | dt-bindings: move Calxeda bindings to appropriate subsystems (diff) | |
| download | linux-dev-62bc9f15e443c3ca02e47f13f339bd7993ae1e65.tar.xz linux-dev-62bc9f15e443c3ca02e47f13f339bd7993ae1e65.zip | |
dt-bindings: merge ina209 binding into ina2xx binding
The ina209 binding only differs from other ina2xx bindings in the
compatible string, so add it to the common binding and remove the ina209
binding file.
Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: Kumar Gala <galak@codeaurora.org>
Diffstat (limited to 'Documentation/devicetree/bindings/hwmon')
| -rw-r--r-- | Documentation/devicetree/bindings/hwmon/ina209.txt | 18 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/hwmon/ina2xx.txt | 1 |
2 files changed, 1 insertions, 18 deletions
diff --git a/Documentation/devicetree/bindings/hwmon/ina209.txt b/Documentation/devicetree/bindings/hwmon/ina209.txt deleted file mode 100644 index 9dd2bee80840..000000000000 --- a/Documentation/devicetree/bindings/hwmon/ina209.txt +++ /dev/null @@ -1,18 +0,0 @@ -ina209 properties - -Required properties: -- compatible: Must be "ti,ina209" -- reg: I2C address - -Optional properties: - -- shunt-resistor - Shunt resistor value in micro-Ohm - -Example: - -temp-sensor@4c { - compatible = "ti,ina209"; - reg = <0x4c>; - shunt-resistor = <5000>; -}; diff --git a/Documentation/devicetree/bindings/hwmon/ina2xx.txt b/Documentation/devicetree/bindings/hwmon/ina2xx.txt index a2ad85d7e747..9bcd5e87830d 100644 --- a/Documentation/devicetree/bindings/hwmon/ina2xx.txt +++ b/Documentation/devicetree/bindings/hwmon/ina2xx.txt @@ -2,6 +2,7 @@ ina2xx properties Required properties: - compatible: Must be one of the following: + - "ti,ina209" for ina209 - "ti,ina219" for ina219 - "ti,ina220" for ina220 - "ti,ina226" for ina226 |