]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
spi: atmel-quadspi: Fix wrong register value written to MR
authorAlexander Dahl <ada@thorsis.com>
Thu, 26 Sep 2024 09:03:56 +0000 (11:03 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 4 Oct 2024 14:30:05 +0000 (16:30 +0200)
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@thorsis.com>
Link: https://lore.kernel.org/linux-spi/20240926-macarena-wincing-7c4995487a29@thorsis.com/T/#u
Link: https://patch.msgid.link/20240926090356.105789-1-ada@thorsis.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/spi/atmel-quadspi.c

index bf7999ac22c80db12d2273f272227d99e96f61db..6f9e9d871677582867bcc44af0277b39ad5d8176 100644 (file)
@@ -377,7 +377,7 @@ static int atmel_qspi_set_cfg(struct atmel_qspi *aq,
         */
        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 */