diff options
| author | Mark Brown | 2018-01-26 18:57:34 +0100 |
|---|---|---|
| committer | Mark Brown | 2018-01-26 18:57:34 +0100 |
| commit | 35a8f1a94d12631afcd55a2a518faa112324f8d1 (patch) | |
| tree | 68e5f2e71bcf481fd91ca1808c19816f704e4758 | |
| parent | Merge remote-tracking branches 'spi/topic/pxa2xx', 'spi/topic/s3c64xx', 'spi/... (diff) | |
| parent | spi: xilinx: Add support for xlnx,axi-quad-spi-1.00.a (diff) | |
| download | kernel-qcow2-linux-35a8f1a94d12631afcd55a2a518faa112324f8d1.tar.gz kernel-qcow2-linux-35a8f1a94d12631afcd55a2a518faa112324f8d1.tar.xz kernel-qcow2-linux-35a8f1a94d12631afcd55a2a518faa112324f8d1.zip | |
Merge remote-tracking branch 'spi/topic/xilinx' into spi-next
| -rw-r--r-- | Documentation/devicetree/bindings/spi/spi-xilinx.txt | 2 | ||||
| -rw-r--r-- | drivers/spi/spi-xilinx.c | 1 |
2 files changed, 2 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. diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c index e0b9fe1d0e37..63fedc49ae9c 100644 --- a/drivers/spi/spi-xilinx.c +++ b/drivers/spi/spi-xilinx.c @@ -381,6 +381,7 @@ static int xilinx_spi_find_buffer_size(struct xilinx_spi *xspi) } static const struct of_device_id xilinx_spi_of_match[] = { + { .compatible = "xlnx,axi-quad-spi-1.00.a", }, { .compatible = "xlnx,xps-spi-2.00.a", }, { .compatible = "xlnx,xps-spi-2.00.b", }, {} |