summaryrefslogtreecommitdiff
path: root/Documentation/devicetree/bindings/spi/fsl-spi.txt
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2013-05-28 12:01:07 +0200
committerJiri Kosina <jkosina@suse.cz>2013-05-28 12:01:07 +0200
commit6e9041c6ddd6cbdc61d87bcaca8ca7bb17c28377 (patch)
treec250644c5adce04947d664318996de16df3f02da /Documentation/devicetree/bindings/spi/fsl-spi.txt
parentb96516220870d8571fc12da980668687c122976e (diff)
parente4aa937ec75df0eea0bee03bffa3303ad36c986b (diff)
Merge branch 'master' into for-next
Diffstat (limited to 'Documentation/devicetree/bindings/spi/fsl-spi.txt')
-rw-r--r--Documentation/devicetree/bindings/spi/fsl-spi.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/spi/fsl-spi.txt b/Documentation/devicetree/bindings/spi/fsl-spi.txt
index 777abd7399d5..b032dd76e9d2 100644
--- a/Documentation/devicetree/bindings/spi/fsl-spi.txt
+++ b/Documentation/devicetree/bindings/spi/fsl-spi.txt
@@ -4,7 +4,7 @@ Required properties:
- cell-index : QE SPI subblock index.
0: QE subblock SPI1
1: QE subblock SPI2
-- compatible : should be "fsl,spi".
+- compatible : should be "fsl,spi" or "aeroflexgaisler,spictrl".
- mode : the SPI operation mode, it can be "cpu" or "cpu-qe".
- reg : Offset and length of the register set for the device
- interrupts : <a b> where a is the interrupt number and b is a
@@ -14,6 +14,7 @@ Required properties:
controller you have.
- interrupt-parent : the phandle for the interrupt controller that
services interrupts for this device.
+- clock-frequency : input clock frequency to non FSL_SOC cores
Optional properties:
- gpios : specifies the gpio pins to be used for chipselects.