spi: atmel-quadspi: Fix wrong register value written to MR

LeSpocky · gregkh · commit 646749b423c4 · 2024-10-04T16:30:05.000+02:00
commit 162d9b5 upstream. aq->mr should go to MR, nothing else. Fixes: 329ca3e ("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>
diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c
@@ -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 */

Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,7 @@ static int atmel_qspi_set_cfg(struct atmel_qspi *aq,`
`377`	`377`	`*/`
`378`	`378`	`if (!(aq->mr & QSPI_MR_SMM)) {`
`379`	`379`	`aq->mr \|= QSPI_MR_SMM;`
`380`		`- atmel_qspi_write(aq->scr, aq, QSPI_MR);`
	`380`	`+ atmel_qspi_write(aq->mr, aq, QSPI_MR);`
`381`	`381`	`}`
`382`	`382`
`383`	`383`	`/* Clear pending interrupts */`