Commit f63501b3 authored by Alexander Dahl's avatar Alexander Dahl Committed by Wen Zhiwei
Browse files

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

stable inclusion
from stable-v6.6.54
commit 646749b423c4dc039e2793c8025fe33ad1ad271b
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAZ3K2

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=646749b423c4dc039e2793c8025fe33ad1ad271b



--------------------------------

commit 162d9b5d2308c7e48efbc97d36babbf4d73b2c61 upstream.

aq->mr should go to MR, nothing else.

Fixes: 329ca3eed4a9 ("spi: atmel-quadspi: Avoid overwriting delay register settings")
Signed-off-by: default avatarAlexander 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: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 42db4123

drivers/spi/atmel-quadspi.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */