GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-05 22:25:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Mark Brown 2018-01-26 17:57:34 +00:00
commit 35a8f1a94d
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/devicetree/bindings/spi/spi-xilinx.txt
View file

@ -2,7 +2,7 @@ Xilinx SPI controller Device Tree Bindings
------------------------------------------------- -------------------------------------------------
Required properties: 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. - reg : Physical base address and size of SPI registers map.
- interrupts : Property with a value describing the interrupt - interrupts : Property with a value describing the interrupt
number. number.

1
drivers/spi/spi-xilinx.c
View 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[] = { 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.a", },
{ .compatible = "xlnx,xps-spi-2.00.b", }, { .compatible = "xlnx,xps-spi-2.00.b", },
{} {}