From 9cc79cd89ada4c403f04d821cded12b9a94e71ee Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Thu, 14 Jun 2012 11:27:56 +0100
Subject: [PATCH] --- yaml --- r: 313350 b: refs/heads/master c:
 612e1d5f1c192996889038598fb82ea03fb01573 h: refs/heads/master v: v3

---
 [refs]                                                    | 2 +-
 trunk/Documentation/devicetree/bindings/gpio/gpio-nmk.txt | 2 +-
 trunk/drivers/pinctrl/pinctrl-nomadik.c                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b273e01535d4..0e27c910f028 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ddb3b99c532930c9f891e97af5ef4e6691076c16
+refs/heads/master: 612e1d5f1c192996889038598fb82ea03fb01573
diff --git a/trunk/Documentation/devicetree/bindings/gpio/gpio-nmk.txt b/trunk/Documentation/devicetree/bindings/gpio/gpio-nmk.txt
index ee87467ad8d6..8315ac7780ef 100644
--- a/trunk/Documentation/devicetree/bindings/gpio/gpio-nmk.txt
+++ b/trunk/Documentation/devicetree/bindings/gpio/gpio-nmk.txt
@@ -26,6 +26,6 @@ Example:
                         #gpio-cells = <2>;
                         gpio-controller;
                         interrupt-controller;
-                        supports-sleepmode;
+                        st,supports-sleepmode;
                         gpio-bank = <1>;
                 };
diff --git a/trunk/drivers/pinctrl/pinctrl-nomadik.c b/trunk/drivers/pinctrl/pinctrl-nomadik.c
index 3e7e47d6b385..dd9e6f26416d 100644
--- a/trunk/drivers/pinctrl/pinctrl-nomadik.c
+++ b/trunk/drivers/pinctrl/pinctrl-nomadik.c
@@ -1198,7 +1198,7 @@ static int __devinit nmk_gpio_probe(struct platform_device *dev)
 		if (!pdata)
 			return -ENOMEM;
 
-		if (of_get_property(np, "supports-sleepmode", NULL))
+		if (of_get_property(np, "st,supports-sleepmode", NULL))
 			pdata->supports_sleepmode = true;
 
 		if (of_property_read_u32(np, "gpio-bank", &dev->id)) {