drop mtd patch

diff --git a/queue-6.1/mtd-spi-nor-spansion-enable-jffs2-write-buffer-for-infineon-s25hx-semper-flash.patch b/queue-6.1/mtd-spi-nor-spansion-enable-jffs2-write-buffer-for-infineon-s25hx-semper-flash.patch
deleted file mode 100644 (file)
index e1873e7..0000000
--- a/queue-6.1/mtd-spi-nor-spansion-enable-jffs2-write-buffer-for-infineon-s25hx-semper-flash.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 4199c1719e24e73be0acc8b0146fc31ad8af9771 Mon Sep 17 00:00:00 2001
-From: Takahiro Kuwano <Takahiro.Kuwano@infineon.com>
-Date: Thu, 6 Apr 2023 15:17:45 +0900
-Subject: mtd: spi-nor: spansion: Enable JFFS2 write buffer for Infineon s25hx SEMPER flash
-
-From: Takahiro Kuwano <Takahiro.Kuwano@infineon.com>
-
-commit 4199c1719e24e73be0acc8b0146fc31ad8af9771 upstream.
-
-Infineon(Cypress) SEMPER NOR flash family has on-die ECC and its program
-granularity is 16-byte ECC data unit size. JFFS2 supports write buffer
-mode for ECC'd NOR flash. Provide a way to clear the MTD_BIT_WRITEABLE
-flag in order to enable JFFS2 write buffer mode support.
-
-Fixes: b6b23833fc42 ("mtd: spi-nor: spansion: Add s25hl-t/s25hs-t IDs and fixups")
-Suggested-by: Tudor Ambarus <tudor.ambarus@linaro.org>
-Signed-off-by: Takahiro Kuwano <Takahiro.Kuwano@infineon.com>
-Cc: stable@vger.kernel.org
-Link: https://lore.kernel.org/r/a1cc128e094db4ec141f85bd380127598dfef17e.1680760742.git.Takahiro.Kuwano@infineon.com
-Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/mtd/spi-nor/spansion.c |    7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
---- a/drivers/mtd/spi-nor/spansion.c
-+++ b/drivers/mtd/spi-nor/spansion.c
-@@ -249,13 +249,10 @@ static void s25hx_t_post_sfdp_fixup(stru
- 
- static void s25hx_t_late_init(struct spi_nor *nor)
- {
--      struct spi_nor_flash_parameter *params = nor->params;
--
-       /* Fast Read 4B requires mode cycles */
--      params->reads[SNOR_CMD_READ_FAST].num_mode_clocks = 8;
-+      nor->params->reads[SNOR_CMD_READ_FAST].num_mode_clocks = 8;
- 
--      /* The writesize should be ECC data unit size */
--      params->writesize = 16;
-+      cypress_nor_ecc_init(nor);
- }
- 
- static struct spi_nor_fixups s25hx_t_fixups = {

diff --git a/queue-6.1/series b/queue-6.1/series
index ba686a8a13a8bcd1ff12d1c47cc3cfe7b5ff3df2..8b291a41e3ab86e0d8fe4a098e814c97b19401da 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -584,7 +584,6 @@ mtd-core-provide-unique-name-for-nvmem-device-take-two.patch
 mtd-core-fix-nvmem-error-reporting.patch
 mtd-core-fix-error-path-for-nvmem-provider.patch
 mtd-spi-nor-core-update-flash-s-current-address-mode-when-changing-address-mode.patch
-mtd-spi-nor-spansion-enable-jffs2-write-buffer-for-infineon-s25hx-semper-flash.patch
 mailbox-zynqmp-fix-ipi-isr-handling.patch
 kcsan-avoid-read_once-in-read_instrumented_memory.patch
 mailbox-zynqmp-fix-typo-in-ipi-documentation.patch

diff --git a/queue-6.2/mtd-spi-nor-spansion-enable-jffs2-write-buffer-for-infineon-s25hx-semper-flash.patch b/queue-6.2/mtd-spi-nor-spansion-enable-jffs2-write-buffer-for-infineon-s25hx-semper-flash.patch
deleted file mode 100644 (file)
index 054b25c..0000000
--- a/queue-6.2/mtd-spi-nor-spansion-enable-jffs2-write-buffer-for-infineon-s25hx-semper-flash.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 4199c1719e24e73be0acc8b0146fc31ad8af9771 Mon Sep 17 00:00:00 2001
-From: Takahiro Kuwano <Takahiro.Kuwano@infineon.com>
-Date: Thu, 6 Apr 2023 15:17:45 +0900
-Subject: mtd: spi-nor: spansion: Enable JFFS2 write buffer for Infineon s25hx SEMPER flash
-
-From: Takahiro Kuwano <Takahiro.Kuwano@infineon.com>
-
-commit 4199c1719e24e73be0acc8b0146fc31ad8af9771 upstream.
-
-Infineon(Cypress) SEMPER NOR flash family has on-die ECC and its program
-granularity is 16-byte ECC data unit size. JFFS2 supports write buffer
-mode for ECC'd NOR flash. Provide a way to clear the MTD_BIT_WRITEABLE
-flag in order to enable JFFS2 write buffer mode support.
-
-Fixes: b6b23833fc42 ("mtd: spi-nor: spansion: Add s25hl-t/s25hs-t IDs and fixups")
-Suggested-by: Tudor Ambarus <tudor.ambarus@linaro.org>
-Signed-off-by: Takahiro Kuwano <Takahiro.Kuwano@infineon.com>
-Cc: stable@vger.kernel.org
-Link: https://lore.kernel.org/r/a1cc128e094db4ec141f85bd380127598dfef17e.1680760742.git.Takahiro.Kuwano@infineon.com
-Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/mtd/spi-nor/spansion.c |    7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
---- a/drivers/mtd/spi-nor/spansion.c
-+++ b/drivers/mtd/spi-nor/spansion.c
-@@ -255,13 +255,10 @@ static void s25hx_t_post_sfdp_fixup(stru
- 
- static void s25hx_t_late_init(struct spi_nor *nor)
- {
--      struct spi_nor_flash_parameter *params = nor->params;
--
-       /* Fast Read 4B requires mode cycles */
--      params->reads[SNOR_CMD_READ_FAST].num_mode_clocks = 8;
-+      nor->params->reads[SNOR_CMD_READ_FAST].num_mode_clocks = 8;
- 
--      /* The writesize should be ECC data unit size */
--      params->writesize = 16;
-+      cypress_nor_ecc_init(nor);
- }
- 
- static struct spi_nor_fixups s25hx_t_fixups = {

diff --git a/queue-6.2/series b/queue-6.2/series
index 9f1ba08b76ce2ec501ad59efeb6a8dfae00d5d98..ba2e0109213edb51b51f376aece20ef47f998b4a 100644 (file)
--- a/queue-6.2/series
+++ b/queue-6.2/series
@@ -636,7 +636,6 @@ mtd-core-provide-unique-name-for-nvmem-device-take-two.patch
 mtd-core-fix-nvmem-error-reporting.patch
 mtd-core-fix-error-path-for-nvmem-provider.patch
 mtd-spi-nor-core-update-flash-s-current-address-mode-when-changing-address-mode.patch
-mtd-spi-nor-spansion-enable-jffs2-write-buffer-for-infineon-s25hx-semper-flash.patch
 drivers-remoteproc-xilinx-fix-carveout-names.patch
 mailbox-zynqmp-fix-ipi-isr-handling.patch
 kcsan-avoid-read_once-in-read_instrumented_memory.patch

diff --git a/queue-6.3/mtd-spi-nor-spansion-enable-jffs2-write-buffer-for-infineon-s25hx-semper-flash.patch b/queue-6.3/mtd-spi-nor-spansion-enable-jffs2-write-buffer-for-infineon-s25hx-semper-flash.patch
deleted file mode 100644 (file)
index 054b25c..0000000
--- a/queue-6.3/mtd-spi-nor-spansion-enable-jffs2-write-buffer-for-infineon-s25hx-semper-flash.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 4199c1719e24e73be0acc8b0146fc31ad8af9771 Mon Sep 17 00:00:00 2001
-From: Takahiro Kuwano <Takahiro.Kuwano@infineon.com>
-Date: Thu, 6 Apr 2023 15:17:45 +0900
-Subject: mtd: spi-nor: spansion: Enable JFFS2 write buffer for Infineon s25hx SEMPER flash
-
-From: Takahiro Kuwano <Takahiro.Kuwano@infineon.com>
-
-commit 4199c1719e24e73be0acc8b0146fc31ad8af9771 upstream.
-
-Infineon(Cypress) SEMPER NOR flash family has on-die ECC and its program
-granularity is 16-byte ECC data unit size. JFFS2 supports write buffer
-mode for ECC'd NOR flash. Provide a way to clear the MTD_BIT_WRITEABLE
-flag in order to enable JFFS2 write buffer mode support.
-
-Fixes: b6b23833fc42 ("mtd: spi-nor: spansion: Add s25hl-t/s25hs-t IDs and fixups")
-Suggested-by: Tudor Ambarus <tudor.ambarus@linaro.org>
-Signed-off-by: Takahiro Kuwano <Takahiro.Kuwano@infineon.com>
-Cc: stable@vger.kernel.org
-Link: https://lore.kernel.org/r/a1cc128e094db4ec141f85bd380127598dfef17e.1680760742.git.Takahiro.Kuwano@infineon.com
-Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/mtd/spi-nor/spansion.c |    7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
---- a/drivers/mtd/spi-nor/spansion.c
-+++ b/drivers/mtd/spi-nor/spansion.c
-@@ -255,13 +255,10 @@ static void s25hx_t_post_sfdp_fixup(stru
- 
- static void s25hx_t_late_init(struct spi_nor *nor)
- {
--      struct spi_nor_flash_parameter *params = nor->params;
--
-       /* Fast Read 4B requires mode cycles */
--      params->reads[SNOR_CMD_READ_FAST].num_mode_clocks = 8;
-+      nor->params->reads[SNOR_CMD_READ_FAST].num_mode_clocks = 8;
- 
--      /* The writesize should be ECC data unit size */
--      params->writesize = 16;
-+      cypress_nor_ecc_init(nor);
- }
- 
- static struct spi_nor_fixups s25hx_t_fixups = {

diff --git a/queue-6.3/series b/queue-6.3/series
index b97fe9645e34e40b738e3c985f4cf9e73eecfba5..80db418043191c5f923b25f39ecff4134a43edf4 100644 (file)
--- a/queue-6.3/series
+++ b/queue-6.3/series
@@ -116,7 +116,6 @@ mtd-core-provide-unique-name-for-nvmem-device-take-two.patch
 mtd-core-fix-nvmem-error-reporting.patch
 mtd-core-fix-error-path-for-nvmem-provider.patch
 mtd-spi-nor-core-update-flash-s-current-address-mode-when-changing-address-mode.patch
-mtd-spi-nor-spansion-enable-jffs2-write-buffer-for-infineon-s25hx-semper-flash.patch
 drivers-remoteproc-xilinx-fix-carveout-names.patch
 mailbox-zynqmp-fix-ipi-isr-handling.patch
 kcsan-avoid-read_once-in-read_instrumented_memory.patch