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
---

Notes:
    based on today's master

 drivers/spi/atmel-quadspi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c
index 4f288f07e38f..95cdfc28361e 100644
--- 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 */

base-commit: 11a299a7933e03c83818b431e6a1c53ad387423d
-- 
2.39.5

On Thu, 26 Sep 2024 11:03:56 +0200, Alexander Dahl wrote:
> aq->mr should go to MR, nothing else.
> 
> 

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next

Thanks!

[1/1] spi: atmel-quadspi: Fix wrong register value written to MR
      commit: 162d9b5d2308c7e48efbc97d36babbf4d73b2c61

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

Hei hei,

Am Thu, Sep 26, 2024 at 11:03:56AM +0200 schrieb Alexander Dahl:
> 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

I've seen the faulty patch 329ca3eed4a9 ("spi: atmel-quadspi: Avoid
overwriting delay register settings") gone not only to master where it
should be fixed before v6.12, but also to stable queue for 6.11,
6.10, and 6.6 so this fixup should go there too, right?

Greets
Alex

> ---
> 
> Notes:
>     based on today's master
> 
>  drivers/spi/atmel-quadspi.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c
> index 4f288f07e38f..95cdfc28361e 100644
> --- 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 */
> 
> base-commit: 11a299a7933e03c83818b431e6a1c53ad387423d
> -- 
> 2.39.5
> 
>