summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi_bfin5xx.c
diff options
context:
space:
mode:
authorMike Frysinger <vapier.adi@gmail.com>2009-04-07 04:00:39 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-07 17:31:05 +0200
commitb31e27a6dc2c6534399c595ba78390125a56e90f (patch)
tree2d2e3d2b1f50c98743e1667e8b86cb3b8180eeb3 /drivers/spi/spi_bfin5xx.c
parentBlackfin SPI Driver: do not check for SPI errors if DMA itself did not flag any (diff)
downloadlinux-b31e27a6dc2c6534399c595ba78390125a56e90f.tar.xz
linux-b31e27a6dc2c6534399c595ba78390125a56e90f.zip
Blackfin SPI Driver: use the properl BIT_CTL_xxx defines
use the properl BIT_CTL_... defines rather than the internal driv er CFG_SPI_... defines Signed-off-by: Mike Frysinger <vapier.adi@gmail.com> Signed-off-by: Bryan Wu <cooloney@kernel.org> Cc: David Brownell <david-b@pacbell.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/spi/spi_bfin5xx.c')
-rw-r--r--drivers/spi/spi_bfin5xx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi_bfin5xx.c b/drivers/spi/spi_bfin5xx.c
index 5ebb67b011d0..1c10efb120db 100644
--- a/drivers/spi/spi_bfin5xx.c
+++ b/drivers/spi/spi_bfin5xx.c
@@ -799,7 +799,7 @@ static void pump_transfers(unsigned long data)
/* start SPI transfer */
write_CTRL(drv_data,
- (cr | CFG_SPI_DMAWRITE | BIT_CTL_ENABLE));
+ (cr | BIT_CTL_TIMOD_DMA_TX | BIT_CTL_ENABLE));
/* just return here, there can only be one transfer
* in this mode
@@ -827,7 +827,7 @@ static void pump_transfers(unsigned long data)
dma_config |= WNR;
dma_start_addr = (unsigned long)drv_data->rx;
- cr |= CFG_SPI_DMAREAD;
+ cr |= BIT_CTL_TIMOD_DMA_RX | BIT_CTL_SENDOPT;
} else if (drv_data->tx != NULL) {
dev_dbg(&drv_data->pdev->dev, "doing DMA out.\n");
@@ -839,7 +839,7 @@ static void pump_transfers(unsigned long data)
drv_data->len_in_bytes));
dma_start_addr = (unsigned long)drv_data->tx;
- cr |= CFG_SPI_DMAWRITE;
+ cr |= BIT_CTL_TIMOD_DMA_TX;
} else
BUG();