spi: rspi: Fix sequencer reset during initialization

commit 26843bb128590edd7eba1ad7ce22e4b9f1066ce3 upstream.

While the sequencer is reset after each SPI message since commit
880c6d114fd79a69 ("spi: rspi: Add support for Quad and Dual SPI
Transfers on QSPI"), it was never reset for the first message, thus
relying on reset state or bootloader settings.

Fix this by initializing it explicitly during configuration.

Fixes: 0b2182ddac4b8837 ("spi: add support for Renesas RSPI")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
index 2c3a8e034d0501a72eb66c71d2372a001654b916..d9c2d3bfc50c4e1f52153554a1020a9ab8cbb1e0 100644 (file)
--- a/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
@@ -277,7 +277,8 @@ static int rspi_set_config_register(struct rspi_data *rspi, int access_size)
        /* Sets parity, interrupt mask */
        rspi_write8(rspi, 0x00, RSPI_SPCR2);
 
-       /* Sets SPCMD */
+       /* Resets sequencer */
+       rspi_write8(rspi, 0, RSPI_SPSCR);
        rspi->spcmd |= SPCMD_SPB_8_TO_16(access_size);
        rspi_write16(rspi, rspi->spcmd, RSPI_SPCMD0);
 
@@ -311,7 +312,8 @@ static int rspi_rz_set_config_register(struct rspi_data *rspi, int access_size)
        rspi_write8(rspi, 0x00, RSPI_SSLND);
        rspi_write8(rspi, 0x00, RSPI_SPND);
 
-       /* Sets SPCMD */
+       /* Resets sequencer */
+       rspi_write8(rspi, 0, RSPI_SPSCR);
        rspi->spcmd |= SPCMD_SPB_8_TO_16(access_size);
        rspi_write16(rspi, rspi->spcmd, RSPI_SPCMD0);
 
@@ -362,7 +364,8 @@ static int qspi_set_config_register(struct rspi_data *rspi, int access_size)
        /* Sets buffer to allow normal operation */
        rspi_write8(rspi, 0x00, QSPI_SPBFCR);
 
-       /* Sets SPCMD */
+       /* Resets sequencer */
+       rspi_write8(rspi, 0, RSPI_SPSCR);
        rspi_write16(rspi, rspi->spcmd, RSPI_SPCMD0);
 
        /* Enables SPI function in master mode */