This is a note to let you know that I've just added the patch titled
spi: spi-sn-f-ospi: fix duplicate flag while assigning to mode_bits
to the 6.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
spi-spi-sn-f-ospi-fix-duplicate-flag-while-assigning-to-mode_bits.patch
and it can be found in the queue-6.2 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 078a5517d22342eb0474046d3e891427a2552e3c Mon Sep 17 00:00:00 2001
From: Dhruva Gole <d-gole@xxxxxx>
Date: Thu, 23 Feb 2023 15:22:02 +0530
Subject: spi: spi-sn-f-ospi: fix duplicate flag while assigning to mode_bits
From: Dhruva Gole <d-gole@xxxxxx>
commit 078a5517d22342eb0474046d3e891427a2552e3c upstream.
Replace the SPI_TX_OCTAL flag that appeared two time with SPI_RX_OCTAL
in the chain of '|' operators while assigning to mode_bits
Fixes: 1b74dd64c861 ("spi: Add Socionext F_OSPI SPI flash controller driver")
Reported-by: David Binderman <dcb314@xxxxxxxxxxx>
Link: https://lore.kernel.org/all/DB6P189MB0568F3BE9384315F5C8C1A3E9CA49@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Dhruva Gole <d-gole@xxxxxx>
Link: https://lore.kernel.org/r/20230223095202.924626-1-d-gole@xxxxxx
Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/spi/spi-sn-f-ospi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/spi/spi-sn-f-ospi.c b/drivers/spi/spi-sn-f-ospi.c
index 348c6e1edd38..333b22dfd8db 100644
--- a/drivers/spi/spi-sn-f-ospi.c
+++ b/drivers/spi/spi-sn-f-ospi.c
@@ -611,7 +611,7 @@ static int f_ospi_probe(struct platform_device *pdev)
return -ENOMEM;
ctlr->mode_bits = SPI_TX_DUAL | SPI_TX_QUAD | SPI_TX_OCTAL
- | SPI_RX_DUAL | SPI_RX_QUAD | SPI_TX_OCTAL
+ | SPI_RX_DUAL | SPI_RX_QUAD | SPI_RX_OCTAL
| SPI_MODE_0 | SPI_MODE_1 | SPI_LSB_FIRST;
ctlr->mem_ops = &f_ospi_mem_ops;
ctlr->bus_num = -1;
--
2.39.2
Patches currently in stable-queue which might be from d-gole@xxxxxx are
queue-6.2/mtd-spi-nor-spansion-consider-reserved-bits-in-cfr5-register.patch
queue-6.2/spi-spi-sn-f-ospi-fix-duplicate-flag-while-assigning-to-mode_bits.patch
queue-6.2/arm64-dts-ti-k3-am62-main-fix-clocks-for-mcspi.patch
