From: Alexander Dahl <ada@xxxxxxxxxxx> commit 162d9b5d2308c7e48efbc97d36babbf4d73b2c61 upstream. aq->mr should go to MR, nothing else. Fixes: 329ca3eed4a9 ("spi: atmel-quadspi: Avoid overwriting delay register settings") Signed-off-by: Alexander Dahl <ada@xxxxxxxxxxx> Link: https://lore.kernel.org/linux-spi/20240926-macarena-wincing-7c4995487a29@xxxxxxxxxxx/T/#u Link: https://patch.msgid.link/20240926090356.105789-1-ada@xxxxxxxxxxx Signed-off-by: Mark Brown <broonie@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/spi/atmel-quadspi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/spi/atmel-quadspi.c +++ b/drivers/spi/atmel-quadspi.c @@ -377,7 +377,7 @@ static int atmel_qspi_set_cfg(struct atm */ if (!(aq->mr & QSPI_MR_SMM)) { aq->mr |= QSPI_MR_SMM; - atmel_qspi_write(aq->scr, aq, QSPI_MR); + atmel_qspi_write(aq->mr, aq, QSPI_MR); } /* Clear pending interrupts */ Patches currently in stable-queue which might be from ada@xxxxxxxxxxx are queue-6.6/spi-atmel-quadspi-fix-wrong-register-value-written-to-mr.patch queue-6.6/spi-atmel-quadspi-avoid-overwriting-delay-register-s.patch queue-6.6/arm-dts-microchip-sam9x60-fix-rtc-rtt-clocks.patch