From 16f2c71757399ca9e2ee824d7ee3f585fa052046 Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Mon, 5 Nov 2012 16:10:34 +0100
Subject: [PATCH] --- yaml --- r: 344956 b: refs/heads/master c:
 84e6de813b2d1bdb127943d3c8edf1c1afaa90da h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 .../devicetree/bindings/mfd/stmpe.txt         | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 trunk/Documentation/devicetree/bindings/mfd/stmpe.txt

diff --git a/[refs] b/[refs]
index f858502a16da..e60ea9310561 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 909582caae384418723ccdb00e848f4140257195
+refs/heads/master: 84e6de813b2d1bdb127943d3c8edf1c1afaa90da
diff --git a/trunk/Documentation/devicetree/bindings/mfd/stmpe.txt b/trunk/Documentation/devicetree/bindings/mfd/stmpe.txt
new file mode 100644
index 000000000000..8f0aeda2e326
--- /dev/null
+++ b/trunk/Documentation/devicetree/bindings/mfd/stmpe.txt
@@ -0,0 +1,25 @@
+* STMPE Multi-Functional Device
+
+Required properties:
+ - compatible                   : "st,stmpe[811|1601|2401|2403]"
+ - reg                          : I2C address of the device
+
+Optional properties:
+ - interrupts                   : The interrupt outputs from the controller
+ - interrupt-controller         : Marks the device node as an interrupt controller
+ - interrupt-parent             : Specifies which IRQ controller we're connected to
+ - i2c-client-wake              : Marks the input device as wakable
+ - st,autosleep-timeout         : Valid entries (ms); 4, 16, 32, 64, 128, 256, 512 and 1024
+
+Example:
+
+	stmpe1601: stmpe1601@40 {
+		compatible = "st,stmpe1601";
+		reg = <0x40>;
+		interrupts = <26 0x4>;
+		interrupt-parent = <&gpio6>;
+		interrupt-controller;
+
+		i2c-client-wake;
+		st,autosleep-timeout = <1024>;
+	};