summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2015-02-21 13:22:23 (GMT)
committerTom Rini <trini@ti.com>2015-02-21 13:22:23 (GMT)
commitb4087b354a888928f87386dc46091e672e14be97 (patch)
tree09b7045b65a1eef2dd8ff8df30bafb030910f528 /doc
parented16f14689b98c1ec98c9f30b92b8edea9d2d60c (diff)
parent66c03151fc8752c29b7d17003b9c87218640b10b (diff)
downloadu-boot-fsl-qoriq-b4087b354a888928f87386dc46091e672e14be97.tar.xz
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'doc')
-rw-r--r--doc/device-tree-bindings/gpio/gpio.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/device-tree-bindings/gpio/gpio.txt b/doc/device-tree-bindings/gpio/gpio.txt
index b9bd1d6..f7a158d 100644
--- a/doc/device-tree-bindings/gpio/gpio.txt
+++ b/doc/device-tree-bindings/gpio/gpio.txt
@@ -69,7 +69,8 @@ GPIO pin number, and GPIO flags as accepted by the "qe_pio_e" gpio-controller.
----------------------------------
A gpio-specifier should contain a flag indicating the GPIO polarity; active-
-high or active-low. If it does, the follow best practices should be followed:
+high or active-low. If it does, the following best practices should be
+followed:
The gpio-specifier's polarity flag should represent the physical level at the
GPIO controller that achieves (or represents, for inputs) a logically asserted
@@ -147,7 +148,7 @@ contains information structures as follows:
numeric-gpio-range ::=
<pinctrl-phandle> <gpio-base> <pinctrl-base> <count>
named-gpio-range ::= <pinctrl-phandle> <gpio-base> '<0 0>'
- gpio-phandle : phandle to pin controller node.
+ pinctrl-phandle : phandle to pin controller node
gpio-base : Base GPIO ID in the GPIO controller
pinctrl-base : Base pinctrl pin ID in the pin controller
count : The number of GPIOs/pins in this range