diff options
| author | Tom Rini <trini@konsulko.com> | 2015-12-11 15:07:44 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-12-11 15:07:44 -0500 |
| commit | 5076c64a08d2083af5a7761b12a30116ef0da967 (patch) | |
| tree | 08953f1cd25ed155eb819162eb495f0153c3edd5 /drivers/spi | |
| parent | f7a5f025ba0bc405e321df4dd55b73a7995ba527 (diff) | |
| parent | 76de51a6da0411e1f3e80e1c9a2ef5bfa8e35571 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/spi/spi-uclass.c | 2 | ||||
| -rw-r--r-- | drivers/spi/ti_qspi.c | 2 | ||||
| -rw-r--r-- | drivers/spi/xilinx_spi.c | 3 | ||||
| -rw-r--r-- | drivers/spi/zynq_spi.c | 1 |
5 files changed, 7 insertions, 3 deletions
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index a0dbd8b640..2cdb11025f 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -140,7 +140,7 @@ config XILINX_SPI config ZYNQ_SPI bool "Zynq SPI driver" - depends on ARCH_ZYNQ || TARGET_XILINX_ZYNQMP + depends on ARCH_ZYNQ || ARCH_ZYNQMP help Enable the Zynq SPI driver. This driver can be used to access the SPI NOR flash on platforms embedding this Zynq diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c index 3c7d64ae63..e0f6b25f30 100644 --- a/drivers/spi/spi-uclass.c +++ b/drivers/spi/spi-uclass.c @@ -378,6 +378,8 @@ int spi_slave_ofdata_to_platdata(const void *blob, int node, mode |= SPI_CPHA; if (fdtdec_get_bool(blob, node, "spi-cs-high")) mode |= SPI_CS_HIGH; + if (fdtdec_get_bool(blob, node, "spi-3wire")) + mode |= SPI_3WIRE; if (fdtdec_get_bool(blob, node, "spi-half-duplex")) mode |= SPI_PREAMBLE; plat->mode = mode; diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c index 646dd899d3..5747ed1fa9 100644 --- a/drivers/spi/ti_qspi.c +++ b/drivers/spi/ti_qspi.c @@ -293,7 +293,7 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout, qslave->cmd = 0; qslave->cmd |= QSPI_WLEN(8); qslave->cmd |= QSPI_EN_CS(slave->cs); - if (flags & SPI_3WIRE) + if (qslave->mode & SPI_3WIRE) qslave->cmd |= QSPI_3_PIN; qslave->cmd |= 0xfff; diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c index 0713714e52..a951a7753d 100644 --- a/drivers/spi/xilinx_spi.c +++ b/drivers/spi/xilinx_spi.c @@ -287,7 +287,8 @@ static const struct dm_spi_ops xilinx_spi_ops = { }; static const struct udevice_id xilinx_spi_ids[] = { - { .compatible = "xlnx,xilinx-spi" }, + { .compatible = "xlnx,xps-spi-2.00.a" }, + { .compatible = "xlnx,xps-spi-2.00.b" }, { } }; diff --git a/drivers/spi/zynq_spi.c b/drivers/spi/zynq_spi.c index 6ed2165355..09ae1be7e9 100644 --- a/drivers/spi/zynq_spi.c +++ b/drivers/spi/zynq_spi.c @@ -313,6 +313,7 @@ static const struct dm_spi_ops zynq_spi_ops = { static const struct udevice_id zynq_spi_ids[] = { { .compatible = "xlnx,zynq-spi-r1p6" }, + { .compatible = "cdns,spi-r1p6" }, { } }; |