Merge tag 'v3.7-rc3' into for-linus to sync up with recent USB changes

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>;
+        };
+