Merge tag 'pinctrl-v3.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[deliverable/linux.git] / Documentation / devicetree / bindings / pinctrl / samsung-pinctrl.txt

diff --git a/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
index 2b32783ba8210dda7fd78b231c512a9e672d694a..e82aaf4925176758437552d0becae0aa530387b7 100644 (file)
--- a/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
@@ -44,7 +44,11 @@ Required Properties:
 - Pin mux/config groups as child nodes: The pin mux (selecting pin function
   mode) and pin config (pull up/down, driver strength) settings are represented
   as child nodes of the pin-controller node. There should be atleast one
-  child node and there is no limit on the count of these child nodes.
+  child node and there is no limit on the count of these child nodes. It is
+  also possible for a child node to consist of several further child nodes
+  to allow grouping multiple pinctrl groups into one. The format of second
+  level child nodes is exactly the same as for first level ones and is
+  described below.
 
   The child node should contain a list of pin(s) on which a particular pin
   function selection or pin configuration (or both) have to applied. This
@@ -71,6 +75,7 @@ Required Properties:
   "samsung,pins" property of the child node. The following pin configuration
   properties are supported.
 
+  - samsung,pin-val: Initial value of pin output buffer.
   - samsung,pin-pud: Pull up/down configuration.
   - samsung,pin-drv: Drive strength configuration.
   - samsung,pin-pud-pdn: Pull up/down configuration in power down mode.
@@ -249,6 +254,23 @@ Example 1: A pin-controller node with pin groups.
                        samsung,pin-pud = <3>;
                        samsung,pin-drv = <0>;
                };
+
+               sd4_bus8: sd4-bus-width8 {
+                       part-1 {
+                               samsung,pins = "gpk0-3", "gpk0-4",
+                                               "gpk0-5", "gpk0-6";
+                               samsung,pin-function = <3>;
+                               samsung,pin-pud = <3>;
+                               samsung,pin-drv = <3>;
+                       };
+                       part-2 {
+                               samsung,pins = "gpk1-3", "gpk1-4",
+                                               "gpk1-5", "gpk1-6";
+                               samsung,pin-function = <4>;
+                               samsung,pin-pud = <4>;
+                               samsung,pin-drv = <3>;
+                       };
+               };
        };
 
 Example 2: A pin-controller node with external wakeup interrupt controller node.