diff options
Diffstat (limited to 'drivers/spi/spi-dw-mid.c')
-rw-r--r-- | drivers/spi/spi-dw-mid.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/spi/spi-dw-mid.c b/drivers/spi/spi-dw-mid.c index 8418eb036651..b9f0192758d6 100644 --- a/drivers/spi/spi-dw-mid.c +++ b/drivers/spi/spi-dw-mid.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
23 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
24 | #include <linux/spi/spi.h> | 24 | #include <linux/spi/spi.h> |
25 | #include <linux/types.h> | ||
25 | 26 | ||
26 | #include "spi-dw.h" | 27 | #include "spi-dw.h" |
27 | 28 | ||
@@ -136,6 +137,7 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change) | |||
136 | txconf.dst_maxburst = LNW_DMA_MSIZE_16; | 137 | txconf.dst_maxburst = LNW_DMA_MSIZE_16; |
137 | txconf.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; | 138 | txconf.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; |
138 | txconf.dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES; | 139 | txconf.dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES; |
140 | txconf.device_fc = false; | ||
139 | 141 | ||
140 | txchan->device->device_control(txchan, DMA_SLAVE_CONFIG, | 142 | txchan->device->device_control(txchan, DMA_SLAVE_CONFIG, |
141 | (unsigned long) &txconf); | 143 | (unsigned long) &txconf); |
@@ -144,7 +146,7 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change) | |||
144 | dws->tx_sgl.dma_address = dws->tx_dma; | 146 | dws->tx_sgl.dma_address = dws->tx_dma; |
145 | dws->tx_sgl.length = dws->len; | 147 | dws->tx_sgl.length = dws->len; |
146 | 148 | ||
147 | txdesc = txchan->device->device_prep_slave_sg(txchan, | 149 | txdesc = dmaengine_prep_slave_sg(txchan, |
148 | &dws->tx_sgl, | 150 | &dws->tx_sgl, |
149 | 1, | 151 | 1, |
150 | DMA_MEM_TO_DEV, | 152 | DMA_MEM_TO_DEV, |
@@ -158,6 +160,7 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change) | |||
158 | rxconf.src_maxburst = LNW_DMA_MSIZE_16; | 160 | rxconf.src_maxburst = LNW_DMA_MSIZE_16; |
159 | rxconf.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; | 161 | rxconf.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; |
160 | rxconf.src_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES; | 162 | rxconf.src_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES; |
163 | rxconf.device_fc = false; | ||
161 | 164 | ||
162 | rxchan->device->device_control(rxchan, DMA_SLAVE_CONFIG, | 165 | rxchan->device->device_control(rxchan, DMA_SLAVE_CONFIG, |
163 | (unsigned long) &rxconf); | 166 | (unsigned long) &rxconf); |
@@ -166,7 +169,7 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change) | |||
166 | dws->rx_sgl.dma_address = dws->rx_dma; | 169 | dws->rx_sgl.dma_address = dws->rx_dma; |
167 | dws->rx_sgl.length = dws->len; | 170 | dws->rx_sgl.length = dws->len; |
168 | 171 | ||
169 | rxdesc = rxchan->device->device_prep_slave_sg(rxchan, | 172 | rxdesc = dmaengine_prep_slave_sg(rxchan, |
170 | &dws->rx_sgl, | 173 | &dws->rx_sgl, |
171 | 1, | 174 | 1, |
172 | DMA_DEV_TO_MEM, | 175 | DMA_DEV_TO_MEM, |