summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-01-26 17:57:34 +0000
committerMark Brown <broonie@kernel.org>2018-01-26 17:57:34 +0000
commit35a8f1a94d12631afcd55a2a518faa112324f8d1 (patch)
tree68e5f2e71bcf481fd91ca1808c19816f704e4758 /Documentation
parent977b06d0a4335f3d0090aa40b1470775d60d8228 (diff)
parenta094c2fa093cf7fd0fe23d15cc2abca4083c6a45 (diff)
downloadlinux-35a8f1a94d12631afcd55a2a518faa112324f8d1.tar.bz2
Merge remote-tracking branch 'spi/topic/xilinx' into spi-next
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/spi/spi-xilinx.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/spi/spi-xilinx.txt b/Documentation/devicetree/bindings/spi/spi-xilinx.txt
index c7b7856bd528..7bf61efc66c8 100644
--- a/Documentation/devicetree/bindings/spi/spi-xilinx.txt
+++ b/Documentation/devicetree/bindings/spi/spi-xilinx.txt
@@ -2,7 +2,7 @@ Xilinx SPI controller Device Tree Bindings
-------------------------------------------------
Required properties:
-- compatible : Should be "xlnx,xps-spi-2.00.a" or "xlnx,xps-spi-2.00.b"
+- compatible : Should be "xlnx,xps-spi-2.00.a", "xlnx,xps-spi-2.00.b" or "xlnx,axi-quad-spi-1.00.a"
- reg : Physical base address and size of SPI registers map.
- interrupts : Property with a value describing the interrupt
number.