diff options
| author |   Sonic Zhang <sonic.zhang@analog.com> | 2007-12-04 23:45:21 -0800 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-05 09:21:20 -0800 |
| commit | 07612e5f224613020c0ba17ce28e8eac052ef8ce (patch) | |
| tree | a401cf425ee349496cf4bfa2015bad601aa6f730 /drivers | |
| parent | spi: spi_bfin: update handling of delay-after-deselect (diff) | |
| download | linux-dev-07612e5f224613020c0ba17ce28e8eac052ef8ce.tar.xz linux-dev-07612e5f224613020c0ba17ce28e8eac052ef8ce.zip | |
spi: spi_bfin: resequence DMA start/stop
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/spi_bfin5xx.c | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/drivers/spi/spi_bfin5xx.c b/drivers/spi/spi_bfin5xx.c index 4dc7e6749322..a85bcb306590 100644 --- a/drivers/spi/spi_bfin5xx.c +++ b/drivers/spi/spi_bfin5xx.c @@ -231,13 +231,13 @@ static int restore_state(struct driver_data *drv_data) dev_dbg(&drv_data->pdev->dev, "restoring spi ctl state\n"); /* Load the registers */ - cs_deactive(drv_data, chip); write_BAUD(drv_data, chip->baud); chip->ctl_reg &= (~BIT_CTL_TIMOD); chip->ctl_reg |= (chip->width << 8); write_CTRL(drv_data, chip->ctl_reg); bfin_spi_enable(drv_data); + cs_active(drv_data, chip); if (ret) dev_dbg(&drv_data->pdev->dev, @@ -767,6 +767,7 @@ static void pump_transfers(unsigned long data) disable_dma(drv_data->dma_channel); clear_dma_irqstat(drv_data->dma_channel); + bfin_spi_disable(drv_data); /* config dma channel */ 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, "doing autobuffer DMA out.\n"); - /* set SPI transfer mode */ - write_CTRL(drv_data, (cr | CFG_SPI_DMAWRITE)); - /* no irq in autobuffer mode */ dma_config = (DMAFLOW_AUTO | RESTART | dma_width | DI_EN); @@ -800,7 +798,13 @@ static void pump_transfers(unsigned long data) (unsigned long)drv_data->tx); 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; giveback(drv_data); return; @@ -811,9 +815,6 @@ static void pump_transfers(unsigned long data) /* set transfer mode, and enable SPI */ 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 */ write_TDBR(drv_data, 0xFFFF); @@ -827,12 +828,13 @@ static void pump_transfers(unsigned long data) (unsigned long)drv_data->rx); 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) { dev_dbg(&drv_data->pdev->dev, "doing DMA out.\n"); - /* set SPI transfer mode */ - write_CTRL(drv_data, (cr | CFG_SPI_DMAWRITE)); - /* start dma */ dma_enable_irq(drv_data->dma_channel); 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, (unsigned long)drv_data->tx); enable_dma(drv_data->dma_channel); + + /* start SPI transfer */ + write_CTRL(drv_data, + (cr | CFG_SPI_DMAWRITE | BIT_CTL_ENABLE)); } } else { /* IO mode write then read */ @@ -1142,6 +1148,8 @@ static int setup(struct spi_device *spi) peripheral_request(ssel[spi->master->bus_num] [chip->chip_select_num-1], DRV_NAME); + cs_deactive(drv_data, chip); + return 0; } |