spi: img-spfi: Set device select bits for SPFI port state

Even if the chip select line is not controlled by the SPFI
hardware, the device select bits need to be set to specify
the chip select line in use for the hardware to know what
parameters to use for the current transfer.

Signed-off-by: Ionela Voinescu <ionela.voinescu@imgtec.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-img-spfi.c b/drivers/spi/spi-img-spfi.c
index 7a37090dabbea55308b555d03f19dd56c4c3c15c..e6eb979f1b8a09f038ec012f288dba4219bfe604 100644 (file)
--- a/drivers/spi/spi-img-spfi.c
+++ b/drivers/spi/spi-img-spfi.c
@@ -419,6 +419,9 @@ static int img_spfi_prepare(struct spi_master *master, struct spi_message *msg)
        u32 val;
 
        val = spfi_readl(spfi, SPFI_PORT_STATE);
+       val &= ~(SPFI_PORT_STATE_DEV_SEL_MASK <<
+                SPFI_PORT_STATE_DEV_SEL_SHIFT);
+       val |= msg->spi->chip_select << SPFI_PORT_STATE_DEV_SEL_SHIFT;
        if (msg->spi->mode & SPI_CPHA)
                val |= SPFI_PORT_STATE_CK_PHASE(msg->spi->chip_select);
        else