From 685c2d88d729800e31dc668a92240b8b7bdd6122 Mon Sep 17 00:00:00 2001
From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Date: Sat, 30 Mar 2013 00:51:12 +0100
Subject: [PATCH] --- yaml --- r: 373967 b: refs/heads/master c:
 d8880a126d96ba0f9e0191826431650c24711d47 h: refs/heads/master i:   373965:
 61c990eb425dd7323007da3d571a2db3c8d88c50   373963:
 f549ec2a3281006f0099d6a2b350a4c5c2cfb886   373959:
 d6df701ac5b3f69e39bac2d1be0d232a9403e417   373951:
 bb0171b2f4d0730cc4e798e14776ff298645b1c2 v: v3

---
 [refs]                                                        | 2 +-
 .../devicetree/bindings/pinctrl/fsl,mxs-pinctrl.txt           | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fe023843fbc4..61566c31b7f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d403408648425450841423733dcd86e606a85c3
+refs/heads/master: d8880a126d96ba0f9e0191826431650c24711d47
diff --git a/trunk/Documentation/devicetree/bindings/pinctrl/fsl,mxs-pinctrl.txt b/trunk/Documentation/devicetree/bindings/pinctrl/fsl,mxs-pinctrl.txt
index f7e8e8f4d9a3..3077370c89af 100644
--- a/trunk/Documentation/devicetree/bindings/pinctrl/fsl,mxs-pinctrl.txt
+++ b/trunk/Documentation/devicetree/bindings/pinctrl/fsl,mxs-pinctrl.txt
@@ -70,6 +70,10 @@ Optional subnode-properties:
     0: Disable the internal pull-up
     1: Enable the internal pull-up
 
+Note that when enabling the pull-up, the internal pad keeper gets disabled.
+Also, some pins doesn't have a pull up, in that case, setting the fsl,pull-up
+will only disable the internal pad keeper.
+
 Examples:
 
 pinctrl@80018000 {