aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-11-13 22:16:50 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-11-13 22:16:50 -0500
commit170c2d0a87922adb43a8e8ca47cba3e30407d4d6 (patch)
tree1e2d95a01484072e00bfa3267636e1d7836bcbd6 /Documentation/devicetree/bindings/spi
parent8266bdd2d716c08c3ebb1d6975daec88826d7f75 (diff)
parent2cd451792db174382aaca96c75bc3bf47a6065fe (diff)
Merge branch 'spi-mcspi' into spi-next
Diffstat (limited to 'Documentation/devicetree/bindings/spi')
-rw-r--r--Documentation/devicetree/bindings/spi/omap-spi.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/spi/omap-spi.txt b/Documentation/devicetree/bindings/spi/omap-spi.txt
index 2ef0a6b85653..938809c6829b 100644
--- a/Documentation/devicetree/bindings/spi/omap-spi.txt
+++ b/Documentation/devicetree/bindings/spi/omap-spi.txt
@@ -6,9 +6,9 @@ Required properties:
6 - "ti,omap4-spi" for OMAP4+. 6 - "ti,omap4-spi" for OMAP4+.
7- ti,spi-num-cs : Number of chipselect supported by the instance. 7- ti,spi-num-cs : Number of chipselect supported by the instance.
8- ti,hwmods: Name of the hwmod associated to the McSPI 8- ti,hwmods: Name of the hwmod associated to the McSPI
9- ti,pindir-d0-in-d1-out: Select the D0 pin as input and D1 as 9- ti,pindir-d0-out-d1-in: Select the D0 pin as output and D1 as
10 output. The default is D0 as output and 10 input. The default is D0 as input and
11 D1 as input. 11 D1 as output.
12 12
13Example: 13Example:
14 14