diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2020-03-27 22:36:17 +0100 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2020-03-27 22:36:17 +0100 |
commit | 06dd3f31cb70035cbd3f507c11fd50e3089aeb81 (patch) | |
tree | 98065919df104fba32191f2464f4193a998cd6a1 /drivers/spi/spi-zynqmp-gqspi.c | |
parent | tools: gpio: Fix out-of-tree build regression (diff) | |
parent | Linux 5.6-rc7 (diff) | |
download | linux-06dd3f31cb70035cbd3f507c11fd50e3089aeb81.tar.xz linux-06dd3f31cb70035cbd3f507c11fd50e3089aeb81.zip |
Merge tag 'v5.6-rc7' into devel
Linux 5.6-rc7
Diffstat (limited to 'drivers/spi/spi-zynqmp-gqspi.c')
-rw-r--r-- | drivers/spi/spi-zynqmp-gqspi.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/spi/spi-zynqmp-gqspi.c b/drivers/spi/spi-zynqmp-gqspi.c index 60c4de4e4485..7412a3042a8d 100644 --- a/drivers/spi/spi-zynqmp-gqspi.c +++ b/drivers/spi/spi-zynqmp-gqspi.c @@ -401,9 +401,6 @@ static void zynqmp_qspi_chipselect(struct spi_device *qspi, bool is_high) zynqmp_gqspi_write(xqspi, GQSPI_GEN_FIFO_OFST, genfifoentry); - /* Dummy generic FIFO entry */ - zynqmp_gqspi_write(xqspi, GQSPI_GEN_FIFO_OFST, 0x0); - /* Manually start the generic FIFO command */ zynqmp_gqspi_write(xqspi, GQSPI_CONFIG_OFST, zynqmp_gqspi_read(xqspi, GQSPI_CONFIG_OFST) | |