From: Rob Herring <robh@kernel.org>
To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Kumar Gala <galak@codeaurora.org>
Subject: [PATCH 8/8] dt-bindings: merge ina209 binding into ina2xx binding
Date: Thu, 1 Oct 2015 17:12:34 -0500 [thread overview]
Message-ID: <1443737554-10352-9-git-send-email-robh@kernel.org> (raw)
In-Reply-To: <1443737554-10352-1-git-send-email-robh@kernel.org>
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>
---
Documentation/devicetree/bindings/hwmon/ina209.txt | 18 ------------------
Documentation/devicetree/bindings/hwmon/ina2xx.txt | 1 +
2 files changed, 1 insertion(+), 18 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/hwmon/ina209.txt
diff --git a/Documentation/devicetree/bindings/hwmon/ina209.txt b/Documentation/devicetree/bindings/hwmon/ina209.txt
deleted file mode 100644
index 9dd2bee..0000000
--- 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 a2ad85d..9bcd5e8 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
--
2.1.4
next prev parent reply other threads:[~2015-10-01 22:13 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-01 22:12 [PATCH 0/8] DT binding doc reorganization Rob Herring
2015-10-01 22:12 ` Rob Herring
2015-10-01 22:12 ` [PATCH 1/8] dt-bindings: consolidate display related bindings Rob Herring
2015-11-04 14:47 ` Thierry Reding
2015-11-04 14:47 ` Thierry Reding
2015-11-04 16:00 ` Rob Herring
2015-10-01 22:12 ` [PATCH 2/8] dt-bindings: move backlight bindings under leds Rob Herring
2015-10-01 22:12 ` Rob Herring
2015-10-01 22:12 ` [PATCH 3/8] dt-bindings: consolidate eeprom bindings Rob Herring
2015-10-01 22:12 ` [PATCH 4/8] dt-bindings: consolidate RNG bindings Rob Herring
2015-10-01 22:12 ` [PATCH 5/8] dt-bindings: consolidate various misc bindings Rob Herring
2015-10-01 22:12 ` [PATCH 6/8] dt-bindings: consolidate USB PHYs in bindings/phy Rob Herring
2015-10-01 22:12 ` Rob Herring
2015-10-01 22:12 ` [PATCH 7/8] dt-bindings: move Calxeda bindings to appropriate subsystems Rob Herring
2015-10-01 22:12 ` Rob Herring [this message]
2015-10-13 20:56 ` [PATCH] dt-bindings: consolidate interrupt controller bindings Rob Herring
2015-10-14 12:59 ` Matthias Brugger
2015-10-14 12:59 ` Matthias Brugger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1443737554-10352-9-git-send-email-robh@kernel.org \
--to=robh@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=pawel.moll@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.