spi: pl022: Handle cs_change for last transfer

Do not deselect cs when cs_change is set for the last transfer in the
message. In this case, cs_change indicates that cs should stay selected
until the next transfer.

Signed-off-by: Fredrik Ternerot <fredrikt@axis.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c
index 6120e6abcd9683f9114b8c12d24fe3431966720c..0c793e31d60f4237680ee1ef98dd869bf61f8dce 100644 (file)
--- a/drivers/spi/spi-pl022.c
+++ b/drivers/spi/spi-pl022.c
@@ -861,11 +861,10 @@ static void dma_callback(void *data)
 
        /* Update total bytes transferred */
        msg->actual_length += pl022->cur_transfer->len;
-       if (pl022->cur_transfer->cs_change)
-               pl022_cs_control(pl022, SSP_CHIP_DESELECT);
-
        /* Move to next transfer */
        msg->state = next_transfer(pl022);
+       if (msg->state != STATE_DONE && pl022->cur_transfer->cs_change)
+               pl022_cs_control(pl022, SSP_CHIP_DESELECT);
        tasklet_schedule(&pl022->pump_transfers);
 }
 
@@ -1333,10 +1332,10 @@ static irqreturn_t pl022_interrupt_handler(int irq, void *dev_id)
                }
                /* Update total bytes transferred */
                msg->actual_length += pl022->cur_transfer->len;
-               if (pl022->cur_transfer->cs_change)
-                       pl022_cs_control(pl022, SSP_CHIP_DESELECT);
                /* Move to next transfer */
                msg->state = next_transfer(pl022);
+               if (msg->state != STATE_DONE && pl022->cur_transfer->cs_change)
+                       pl022_cs_control(pl022, SSP_CHIP_DESELECT);
                tasklet_schedule(&pl022->pump_transfers);
                return IRQ_HANDLED;
        }
@@ -1544,10 +1543,11 @@ static void do_polling_transfer(struct pl022 *pl022)
 
                /* Update total byte transferred */
                message->actual_length += pl022->cur_transfer->len;
-               if (pl022->cur_transfer->cs_change)
-                       pl022_cs_control(pl022, SSP_CHIP_DESELECT);
                /* Move to next transfer */
                message->state = next_transfer(pl022);
+               if (message->state != STATE_DONE
+                   && pl022->cur_transfer->cs_change)
+                       pl022_cs_control(pl022, SSP_CHIP_DESELECT);
        }
 out:
        /* Handle end of message */