---

yaml --- r: 373967 b: refs/heads/master c: d8880a1 h: refs/heads/master i: 373965: 61c990e 373963: f549ec2 373959: d6df701 373951: bb0171b v: v3
git-mirror · Apr 4, 2013 · 685c2d8 · 685c2d8
1 parent ccda8e4
commit 685c2d8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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 {