summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-27 20:09:07 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-27 20:09:07 +0400
commit7da59d2fe30d8169c7c9e7b488beb1b9af932608 (patch)
tree02438ff9c258cf80d3a3955215fbcff7bd7e392e /Documentation
parentfea7a08acb13524b47711625eebea40a0ede69a0 (diff)
parent877cdf3949cc67d00677a1dfb913001f324ac40d (diff)
downloadlinux-7da59d2fe30d8169c7c9e7b488beb1b9af932608.tar.xz
Merge v3.6-rc3 into 'char-misc-next'
This resolves a conflict in: drivers/misc/mei/interrupt.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/w1/w1-gpio.txt22
1 files changed, 22 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/w1/w1-gpio.txt b/Documentation/devicetree/bindings/w1/w1-gpio.txt
new file mode 100644
index 000000000000..6e09c35d9f1a
--- /dev/null
+++ b/Documentation/devicetree/bindings/w1/w1-gpio.txt
@@ -0,0 +1,22 @@
+w1-gpio devicetree bindings
+
+Required properties:
+
+ - compatible: "w1-gpio"
+ - gpios: one or two GPIO specs:
+ - the first one is used as data I/O pin
+ - the second one is optional. If specified, it is used as
+ enable pin for an external pin pullup.
+
+Optional properties:
+
+ - linux,open-drain: if specified, the data pin is considered in
+ open-drain mode.
+
+Examples:
+
+ onewire@0 {
+ compatible = "w1-gpio";
+ gpios = <&gpio 126 0>, <&gpio 105 0>;
+ };
+