mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-13 14:14:37 +00:00
Code Issues Releases Wiki Activity

spi: spi_bfin: resequence DMA start/stop

Browse source 
Set correct baud for spi mmc and enable SPI only after DMA is started.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Sonic Zhang 2007-12-04 23:45:21 -08:00 committed by Linus Torvalds
parent 62310e51ac
commit 07612e5f22
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
drivers/spi/spi_bfin5xx.c
View file

@ -231,13 +231,13 @@ static int restore_state(struct driver_data *drv_data)
dev_dbg(&drv_data->pdev->dev, "restoring spi ctl state\n"); dev_dbg(&drv_data->pdev->dev, "restoring spi ctl state\n");
/* Load the registers */ /* Load the registers */
cs_deactive(drv_data, chip);
write_BAUD(drv_data, chip->baud); write_BAUD(drv_data, chip->baud);
chip->ctl_reg &= (~BIT_CTL_TIMOD); chip->ctl_reg &= (~BIT_CTL_TIMOD);
chip->ctl_reg |= (chip->width << 8); chip->ctl_reg |= (chip->width << 8);
write_CTRL(drv_data, chip->ctl_reg); write_CTRL(drv_data, chip->ctl_reg);
bfin_spi_enable(drv_data); bfin_spi_enable(drv_data);
cs_active(drv_data, chip);
if (ret) if (ret)
dev_dbg(&drv_data->pdev->dev, dev_dbg(&drv_data->pdev->dev,
@ -767,6 +767,7 @@ static void pump_transfers(unsigned long data)
disable_dma(drv_data->dma_channel); disable_dma(drv_data->dma_channel);
clear_dma_irqstat(drv_data->dma_channel); clear_dma_irqstat(drv_data->dma_channel);
bfin_spi_disable(drv_data);
/* config dma channel */ /* config dma channel */
dev_dbg(&drv_data->pdev->dev, "doing dma transfer\n"); dev_dbg(&drv_data->pdev->dev, "doing dma transfer\n");
@ -789,9 +790,6 @@ static void pump_transfers(unsigned long data)
dev_dbg(&drv_data->pdev->dev, dev_dbg(&drv_data->pdev->dev,
"doing autobuffer DMA out.\n"); "doing autobuffer DMA out.\n");
/* set SPI transfer mode */
write_CTRL(drv_data, (cr | CFG_SPI_DMAWRITE));
/* no irq in autobuffer mode */ /* no irq in autobuffer mode */
dma_config = dma_config =
(DMAFLOW_AUTO | RESTART | dma_width | DI_EN); (DMAFLOW_AUTO | RESTART | dma_width | DI_EN);
@ -800,7 +798,13 @@ static void pump_transfers(unsigned long data)
(unsigned long)drv_data->tx); (unsigned long)drv_data->tx);
enable_dma(drv_data->dma_channel); enable_dma(drv_data->dma_channel);
/* just return here, there can only be one transfer in this mode */ /* start SPI transfer */
write_CTRL(drv_data,
(cr | CFG_SPI_DMAWRITE | BIT_CTL_ENABLE));
/* just return here, there can only be one transfer
* in this mode
*/
message->status = 0; message->status = 0;
giveback(drv_data); giveback(drv_data);
return; return;
@ -811,9 +815,6 @@ static void pump_transfers(unsigned long data)
/* set transfer mode, and enable SPI */ /* set transfer mode, and enable SPI */
dev_dbg(&drv_data->pdev->dev, "doing DMA in.\n"); dev_dbg(&drv_data->pdev->dev, "doing DMA in.\n");
/* set SPI transfer mode */
write_CTRL(drv_data, (cr | CFG_SPI_DMAREAD));
/* clear tx reg soformer data is not shifted out */ /* clear tx reg soformer data is not shifted out */
write_TDBR(drv_data, 0xFFFF); write_TDBR(drv_data, 0xFFFF);
@ -827,12 +828,13 @@ static void pump_transfers(unsigned long data)
(unsigned long)drv_data->rx); (unsigned long)drv_data->rx);
enable_dma(drv_data->dma_channel); enable_dma(drv_data->dma_channel);
/* start SPI transfer */
write_CTRL(drv_data,
(cr | CFG_SPI_DMAREAD | BIT_CTL_ENABLE));
} else if (drv_data->tx != NULL) { } else if (drv_data->tx != NULL) {
dev_dbg(&drv_data->pdev->dev, "doing DMA out.\n"); dev_dbg(&drv_data->pdev->dev, "doing DMA out.\n");
/* set SPI transfer mode */
write_CTRL(drv_data, (cr | CFG_SPI_DMAWRITE));
/* start dma */ /* start dma */
dma_enable_irq(drv_data->dma_channel); dma_enable_irq(drv_data->dma_channel);
dma_config = (RESTART | dma_width | DI_EN); dma_config = (RESTART | dma_width | DI_EN);
@ -840,6 +842,10 @@ static void pump_transfers(unsigned long data)
set_dma_start_addr(drv_data->dma_channel, set_dma_start_addr(drv_data->dma_channel,
(unsigned long)drv_data->tx); (unsigned long)drv_data->tx);
enable_dma(drv_data->dma_channel); enable_dma(drv_data->dma_channel);
/* start SPI transfer */
write_CTRL(drv_data,
(cr | CFG_SPI_DMAWRITE | BIT_CTL_ENABLE));
} }
} else { } else {
/* IO mode write then read */ /* IO mode write then read */
@ -1142,6 +1148,8 @@ static int setup(struct spi_device *spi)
peripheral_request(ssel[spi->master->bus_num] peripheral_request(ssel[spi->master->bus_num]
[chip->chip_select_num-1], DRV_NAME); [chip->chip_select_num-1], DRV_NAME);
cs_deactive(drv_data, chip);
return 0; return 0;
} }