Merge remote-tracking branch 'spi/topic/xilinx' into spi-next
authorMark Brown <broonie@kernel.org>
Fri, 26 Jan 2018 17:57:34 +0000 (17:57 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 26 Jan 2018 17:57:34 +0000 (17:57 +0000)
Documentation/devicetree/bindings/spi/spi-xilinx.txt
drivers/spi/spi-xilinx.c

index c7b7856..7bf61ef 100644 (file)
@@ -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.
index e0b9fe1..63fedc4 100644 (file)
@@ -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", },
        {}