From 904aa97eb8c144f88d8920656e6f534b4d4208a4 Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Wed, 4 Apr 2012 17:06:41 +0100
Subject: [PATCH] --- yaml --- r: 303207 b: refs/heads/master c:
 b55ac4ea96adc907bec7b0a804c1edd3dbf2e64d h: refs/heads/master i:   303205:
 18b10a845850d7f8aa787c0dbfeef688e8544307   303203:
 edbc95dc0546f2679d4e66dabe72a0398b450aff   303199:
 648532ac1a58d8d1cbec872da4444e935d449ef7 v: v3

---
 [refs]                                        |  2 +-
 .../devicetree/bindings/gpio/gpio-nmk.txt     | 29 +++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 trunk/Documentation/devicetree/bindings/gpio/gpio-nmk.txt

diff --git a/[refs] b/[refs]
index 476dc269165c..4ec2cf7a9c46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0b133bda1eb89f7ce737fc7c646fa68ec7b9f1a
+refs/heads/master: b55ac4ea96adc907bec7b0a804c1edd3dbf2e64d
diff --git a/trunk/Documentation/devicetree/bindings/gpio/gpio-nmk.txt b/trunk/Documentation/devicetree/bindings/gpio/gpio-nmk.txt
new file mode 100644
index 000000000000..3856789b52ea
--- /dev/null
+++ b/trunk/Documentation/devicetree/bindings/gpio/gpio-nmk.txt
@@ -0,0 +1,29 @@
+Nomadik GPIO controller
+
+Required properties:
+- compatible            : Should be "st,nomadik-gpio".
+- reg                   : Physical base address and length of the controller's registers.
+- interrupts            : The interrupt outputs from the controller.
+- #gpio-cells           : Should be two:
+                            The first cell is the pin number.
+                            The second cell is used to specify optional parameters:
+                              - bits[3:0] trigger type and level flags:
+                                  1 = low-to-high edge triggered.
+                                  2 = high-to-low edge triggered.
+                                  4 = active high level-sensitive.
+                                  8 = active low level-sensitive.
+- gpio-controller       : Marks the device node as a GPIO controller.
+- gpio-bank             : Specifies which bank a controller owns.
+- st,supports-sleepmode : Specifies whether controller can sleep or not
+
+Example:
+
+                gpio1: gpio@8012e080 {
+                        compatible = "st,nomadik-gpio";
+                        reg =  <0x8012e080 0x80>;
+                        interrupts = <0 120 0x4>;
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        supports-sleepmode;
+                        gpio-bank = <1>;
+                };