diff options
| author | Andrew Bresticker <abrestic@chromium.org> | 2015-04-08 19:03:15 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-08 22:04:28 +0200 |
| commit | ba33d8ac0c93fdfbdbc825ef690caab5d57e22c2 (patch) | |
| tree | 836b32cd51fa1516058d1c7981402cab6f099989 /drivers/spi/spi-img-spfi.c | |
| parent | spi: img-spfi: Implement a handle_err() callback (diff) | |
| download | linux-ba33d8ac0c93fdfbdbc825ef690caab5d57e22c2.tar.xz linux-ba33d8ac0c93fdfbdbc825ef690caab5d57e22c2.zip | |
spi: img-spfi: Reset controller after each message
Imagination has recommended that the SPFI controller be reset after
each message, regardless of success or failure. Do this in an
unprepare_message() callback.
Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-img-spfi.c')
| -rw-r--r-- | drivers/spi/spi-img-spfi.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/spi/spi-img-spfi.c b/drivers/spi/spi-img-spfi.c index 3fd7b07c3eef..c37f6e50096e 100644 --- a/drivers/spi/spi-img-spfi.c +++ b/drivers/spi/spi-img-spfi.c @@ -414,8 +414,6 @@ static void img_spfi_handle_err(struct spi_master *master, dmaengine_terminate_all(spfi->rx_ch); } spin_unlock_irqrestore(&spfi->lock, flags); - - spfi_reset(spfi); } static int img_spfi_prepare(struct spi_master *master, struct spi_message *msg) @@ -437,6 +435,16 @@ static int img_spfi_prepare(struct spi_master *master, struct spi_message *msg) return 0; } +static int img_spfi_unprepare(struct spi_master *master, + struct spi_message *msg) +{ + struct img_spfi *spfi = spi_master_get_devdata(master); + + spfi_reset(spfi); + + return 0; +} + static void img_spfi_config(struct spi_master *master, struct spi_device *spi, struct spi_transfer *xfer) { @@ -610,6 +618,7 @@ static int img_spfi_probe(struct platform_device *pdev) master->set_cs = img_spfi_set_cs; master->transfer_one = img_spfi_transfer_one; master->prepare_message = img_spfi_prepare; + master->unprepare_message = img_spfi_unprepare; master->handle_err = img_spfi_handle_err; spfi->tx_ch = dma_request_slave_channel(spfi->dev, "tx"); |