diff options
author | Vinod Koul <vinod.koul@linux.intel.com> | 2011-10-14 01:17:38 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@linux.intel.com> | 2011-10-31 00:10:26 -0400 |
commit | a485df4b4404379786c4bdd258bc528b2617449d (patch) | |
tree | 67244495fab89846568cf40d3b7c3a2bd011133e /drivers/spi/spi-pl022.c | |
parent | 05f5799cbe5c9e2c03f604b3de5783cf4d726227 (diff) |
spi, serial: move to dma_transfer_direction
fixup usage of dma direction by introducing dma_transfer_direction,
this patch moves spi, serial drivers to use new enum
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Alan Cox <alan@linux.intel.com>
Acked-by: Mika Westerberg <mika.westerberg@iki.fi>
Diffstat (limited to 'drivers/spi/spi-pl022.c')
-rw-r--r-- | drivers/spi/spi-pl022.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c index 730b4a37b823..ddcddf4b1248 100644 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c | |||
@@ -910,11 +910,11 @@ static int configure_dma(struct pl022 *pl022) | |||
910 | { | 910 | { |
911 | struct dma_slave_config rx_conf = { | 911 | struct dma_slave_config rx_conf = { |
912 | .src_addr = SSP_DR(pl022->phybase), | 912 | .src_addr = SSP_DR(pl022->phybase), |
913 | .direction = DMA_FROM_DEVICE, | 913 | .direction = DMA_DEV_TO_MEM, |
914 | }; | 914 | }; |
915 | struct dma_slave_config tx_conf = { | 915 | struct dma_slave_config tx_conf = { |
916 | .dst_addr = SSP_DR(pl022->phybase), | 916 | .dst_addr = SSP_DR(pl022->phybase), |
917 | .direction = DMA_TO_DEVICE, | 917 | .direction = DMA_MEM_TO_DEV, |
918 | }; | 918 | }; |
919 | unsigned int pages; | 919 | unsigned int pages; |
920 | int ret; | 920 | int ret; |
@@ -1051,7 +1051,7 @@ static int configure_dma(struct pl022 *pl022) | |||
1051 | rxdesc = rxchan->device->device_prep_slave_sg(rxchan, | 1051 | rxdesc = rxchan->device->device_prep_slave_sg(rxchan, |
1052 | pl022->sgt_rx.sgl, | 1052 | pl022->sgt_rx.sgl, |
1053 | rx_sglen, | 1053 | rx_sglen, |
1054 | DMA_FROM_DEVICE, | 1054 | DMA_DEV_TO_MEM, |
1055 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK); | 1055 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK); |
1056 | if (!rxdesc) | 1056 | if (!rxdesc) |
1057 | goto err_rxdesc; | 1057 | goto err_rxdesc; |
@@ -1059,7 +1059,7 @@ static int configure_dma(struct pl022 *pl022) | |||
1059 | txdesc = txchan->device->device_prep_slave_sg(txchan, | 1059 | txdesc = txchan->device->device_prep_slave_sg(txchan, |
1060 | pl022->sgt_tx.sgl, | 1060 | pl022->sgt_tx.sgl, |
1061 | tx_sglen, | 1061 | tx_sglen, |
1062 | DMA_TO_DEVICE, | 1062 | DMA_MEM_TO_DEV, |
1063 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK); | 1063 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK); |
1064 | if (!txdesc) | 1064 | if (!txdesc) |
1065 | goto err_txdesc; | 1065 | goto err_txdesc; |