Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 35a8f1a9 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'spi/topic/xilinx' into spi-next

parents 977b06d0 a094c2fa

Documentation/devicetree/bindings/spi/spi-xilinx.txt

+1 −1
Original line number Diff line number Diff line
@@ -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.

drivers/spi/spi-xilinx.c

+1 −0
Original line number Diff line number Diff line
@@ -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", },

	{}