diff options
Diffstat (limited to 'drivers/spi/spi-pl022.c')
-rw-r--r-- | drivers/spi/spi-pl022.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c index dc8485d1e883..96f0da66b185 100644 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c | |||
@@ -880,10 +880,12 @@ static int configure_dma(struct pl022 *pl022) | |||
880 | struct dma_slave_config rx_conf = { | 880 | struct dma_slave_config rx_conf = { |
881 | .src_addr = SSP_DR(pl022->phybase), | 881 | .src_addr = SSP_DR(pl022->phybase), |
882 | .direction = DMA_DEV_TO_MEM, | 882 | .direction = DMA_DEV_TO_MEM, |
883 | .device_fc = false, | ||
883 | }; | 884 | }; |
884 | struct dma_slave_config tx_conf = { | 885 | struct dma_slave_config tx_conf = { |
885 | .dst_addr = SSP_DR(pl022->phybase), | 886 | .dst_addr = SSP_DR(pl022->phybase), |
886 | .direction = DMA_MEM_TO_DEV, | 887 | .direction = DMA_MEM_TO_DEV, |
888 | .device_fc = false, | ||
887 | }; | 889 | }; |
888 | unsigned int pages; | 890 | unsigned int pages; |
889 | int ret; | 891 | int ret; |
@@ -1017,7 +1019,7 @@ static int configure_dma(struct pl022 *pl022) | |||
1017 | goto err_tx_sgmap; | 1019 | goto err_tx_sgmap; |
1018 | 1020 | ||
1019 | /* Send both scatterlists */ | 1021 | /* Send both scatterlists */ |
1020 | rxdesc = rxchan->device->device_prep_slave_sg(rxchan, | 1022 | rxdesc = dmaengine_prep_slave_sg(rxchan, |
1021 | pl022->sgt_rx.sgl, | 1023 | pl022->sgt_rx.sgl, |
1022 | rx_sglen, | 1024 | rx_sglen, |
1023 | DMA_DEV_TO_MEM, | 1025 | DMA_DEV_TO_MEM, |
@@ -1025,7 +1027,7 @@ static int configure_dma(struct pl022 *pl022) | |||
1025 | if (!rxdesc) | 1027 | if (!rxdesc) |
1026 | goto err_rxdesc; | 1028 | goto err_rxdesc; |
1027 | 1029 | ||
1028 | txdesc = txchan->device->device_prep_slave_sg(txchan, | 1030 | txdesc = dmaengine_prep_slave_sg(txchan, |
1029 | pl022->sgt_tx.sgl, | 1031 | pl022->sgt_tx.sgl, |
1030 | tx_sglen, | 1032 | tx_sglen, |
1031 | DMA_MEM_TO_DEV, | 1033 | DMA_MEM_TO_DEV, |