diff options
| author | Mark Brown <broonie@kernel.org> | 2019-07-04 18:35:07 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-07-04 18:35:07 +0200 |
| commit | 106dbe24d4146c0804cb025e450ac7af42d72356 (patch) | |
| tree | ad196f245894a8546603f8472619f9e5b73b8265 /drivers/spi/spi-rockchip.c | |
| parent | Merge branch 'spi-5.2' into spi-linus (diff) | |
| parent | spi: pxa2xx: Add support for Intel Elkhart Lake (diff) | |
| download | linux-106dbe24d4146c0804cb025e450ac7af42d72356.tar.xz linux-106dbe24d4146c0804cb025e450ac7af42d72356.zip | |
Merge branch 'spi-5.3' into spi-next
Diffstat (limited to 'drivers/spi/spi-rockchip.c')
| -rw-r--r-- | drivers/spi/spi-rockchip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c index 9b91188a85f9..2cc6d9951b52 100644 --- a/drivers/spi/spi-rockchip.c +++ b/drivers/spi/spi-rockchip.c @@ -417,7 +417,7 @@ static int rockchip_spi_prepare_dma(struct rockchip_spi *rs, .direction = DMA_MEM_TO_DEV, .dst_addr = rs->dma_addr_tx, .dst_addr_width = rs->n_bytes, - .dst_maxburst = rs->fifo_len / 2, + .dst_maxburst = rs->fifo_len / 4, }; dmaengine_slave_config(master->dma_tx, &txconf); @@ -518,7 +518,7 @@ static void rockchip_spi_config(struct rockchip_spi *rs, else writel_relaxed(rs->fifo_len / 2 - 1, rs->regs + ROCKCHIP_SPI_RXFTLR); - writel_relaxed(rs->fifo_len / 2 - 1, rs->regs + ROCKCHIP_SPI_DMATDLR); + writel_relaxed(rs->fifo_len / 2, rs->regs + ROCKCHIP_SPI_DMATDLR); writel_relaxed(0, rs->regs + ROCKCHIP_SPI_DMARDLR); writel_relaxed(dmacr, rs->regs + ROCKCHIP_SPI_DMACR); |