diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-12-06 17:17:24 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-12-06 17:17:24 +0100 |
| commit | dd63af108f0814f0b589659f4e55a7a5af3b7e53 (patch) | |
| tree | 0a7679fecb5b516cddb2153c632a4262899be6c3 /Documentation/devicetree/bindings/pinctrl/img,tz1090-pdc-pinctrl.txt | |
| parent | serial: pxa: hold port.lock when reporting modem line changes (diff) | |
| parent | Linux 3.18-rc7 (diff) | |
| download | linux-dd63af108f0814f0b589659f4e55a7a5af3b7e53.tar.xz linux-dd63af108f0814f0b589659f4e55a7a5af3b7e53.zip | |
Merge 3.18-rc7 into tty-next
This resolves the merge issue with drivers/tty/serial/of_serial.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/devicetree/bindings/pinctrl/img,tz1090-pdc-pinctrl.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/img,tz1090-pdc-pinctrl.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/img,tz1090-pdc-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/img,tz1090-pdc-pinctrl.txt index a186181c402b..51b943cc9770 100644 --- a/Documentation/devicetree/bindings/pinctrl/img,tz1090-pdc-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/img,tz1090-pdc-pinctrl.txt @@ -9,7 +9,7 @@ Please refer to pinctrl-bindings.txt in this directory for details of the common pinctrl bindings used by client devices, including the meaning of the phrase "pin configuration node". -TZ1090-PDC's pin configuration nodes act as a container for an abitrary number +TZ1090-PDC's pin configuration nodes act as a container for an arbitrary number of subnodes. Each of these subnodes represents some desired configuration for a pin, a group, or a list of pins or groups. This configuration can include the mux function to select on those pin(s)/group(s), and various pin configuration |