From: Greg Kroah-Hartman Date: Thu, 3 Oct 2024 07:14:31 +0000 (+0200) Subject: 6.10-stable patches X-Git-Tag: v6.6.54~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=11838c074f60d9f08601c168f4f7e358c1c73d08;p=thirdparty%2Fkernel%2Fstable-queue.git 6.10-stable patches added patches: spi-atmel-quadspi-fix-wrong-register-value-written-to-mr.patch --- diff --git a/queue-6.10/series b/queue-6.10/series index 684b3be87ac..830500ccb44 100644 --- a/queue-6.10/series +++ b/queue-6.10/series @@ -632,3 +632,4 @@ i2c-aspeed-update-the-stop-sw-state-when-the-bus-recovery-occurs.patch i2c-isch-add-missed-else.patch documentation-kvm-fix-warning-in-make-htmldocs.patch bpf-fix-use-after-free-in-bpf_uprobe_multi_link_attach.patch +spi-atmel-quadspi-fix-wrong-register-value-written-to-mr.patch diff --git a/queue-6.10/spi-atmel-quadspi-fix-wrong-register-value-written-to-mr.patch b/queue-6.10/spi-atmel-quadspi-fix-wrong-register-value-written-to-mr.patch new file mode 100644 index 00000000000..3826695a0bd --- /dev/null +++ b/queue-6.10/spi-atmel-quadspi-fix-wrong-register-value-written-to-mr.patch @@ -0,0 +1,32 @@ +From 162d9b5d2308c7e48efbc97d36babbf4d73b2c61 Mon Sep 17 00:00:00 2001 +From: Alexander Dahl +Date: Thu, 26 Sep 2024 11:03:56 +0200 +Subject: spi: atmel-quadspi: Fix wrong register value written to MR + +From: Alexander Dahl + +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 +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 +Signed-off-by: Greg Kroah-Hartman +--- + 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 */