spi: atmel-quadspi: Move common code outside of if else

QSPI_IFR is set as the last QSPI Instruction Frame register
regardless of the sama5d2 or sam9x60 version of the IP. Move
the writing of QSPI_IFR outside of the IP specific code.

Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Link: https://lore.kernel.org/r/20201207135959.154124-5-tudor.ambarus@microchip.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c
index 3a978ee8b70fa064781e96dd50c7d1b739d7d0a0..f56640d63982c377d773db1c51802224e4e1bea7 100644 (file)
--- a/drivers/spi/atmel-quadspi.c
+++ b/drivers/spi/atmel-quadspi.c
@@ -394,15 +394,15 @@ static int atmel_qspi_set_cfg(struct atmel_qspi *aq,
                        atmel_qspi_write(icr, aq, QSPI_RICR);
                else
                        atmel_qspi_write(icr, aq, QSPI_WICR);
-               atmel_qspi_write(ifr, aq, QSPI_IFR);
        } else {
                if (op->data.nbytes && op->data.dir == SPI_MEM_DATA_OUT)
                        ifr |= QSPI_IFR_SAMA5D2_WRITE_TRSFR;
 
                atmel_qspi_write(icr, aq, QSPI_ICR);
-               atmel_qspi_write(ifr, aq, QSPI_IFR);
        }
 
+       atmel_qspi_write(ifr, aq, QSPI_IFR);
+
        return 0;
 }