From: Greg Kroah-Hartman Date: Tue, 25 Feb 2025 07:57:15 +0000 (+0100) Subject: 6.1-stable patches X-Git-Tag: v6.6.80~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d09411b33f0a997d0c626751288f9e671149877;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: spi-atmel-quadspi-fix-wrong-register-value-written-to-mr.patch --- diff --git a/queue-6.1/series b/queue-6.1/series index 51117843b4..b86d72fd0d 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -92,3 +92,4 @@ block-bfq-split-sync-bfq_queues-on-a-per-actuator-basis.patch block-bfq-fix-bfqq-uaf-in-bfq_limit_depth.patch media-mediatek-vcodec-fix-h264-multi-stateless-decoder-smatch-warning.patch spi-atmel-quadspi-avoid-overwriting-delay-register-settings.patch +spi-atmel-quadspi-fix-wrong-register-value-written-to-mr.patch diff --git a/queue-6.1/spi-atmel-quadspi-fix-wrong-register-value-written-to-mr.patch b/queue-6.1/spi-atmel-quadspi-fix-wrong-register-value-written-to-mr.patch new file mode 100644 index 0000000000..59a4e7193b --- /dev/null +++ b/queue-6.1/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 +@@ -390,7 +390,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 */