From f2dac839ea20793047b1a36e108693560fbd5d6d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 7 May 2023 13:25:01 +0200 Subject: [PATCH] drop mtd patch --- ...ffer-for-infineon-s25hx-semper-flash.patch | 43 ------------------- queue-6.1/series | 1 - ...ffer-for-infineon-s25hx-semper-flash.patch | 43 ------------------- queue-6.2/series | 1 - ...ffer-for-infineon-s25hx-semper-flash.patch | 43 ------------------- queue-6.3/series | 1 - 6 files changed, 132 deletions(-) delete mode 100644 queue-6.1/mtd-spi-nor-spansion-enable-jffs2-write-buffer-for-infineon-s25hx-semper-flash.patch delete mode 100644 queue-6.2/mtd-spi-nor-spansion-enable-jffs2-write-buffer-for-infineon-s25hx-semper-flash.patch delete mode 100644 queue-6.3/mtd-spi-nor-spansion-enable-jffs2-write-buffer-for-infineon-s25hx-semper-flash.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 index e1873e70404..00000000000 --- 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 -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 - -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 -Signed-off-by: Takahiro Kuwano -Cc: stable@vger.kernel.org -Link: https://lore.kernel.org/r/a1cc128e094db4ec141f85bd380127598dfef17e.1680760742.git.Takahiro.Kuwano@infineon.com -Signed-off-by: Tudor Ambarus -Signed-off-by: Greg Kroah-Hartman ---- - 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 ba686a8a13a..8b291a41e3a 100644 --- 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 index 054b25cd585..00000000000 --- 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 -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 - -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 -Signed-off-by: Takahiro Kuwano -Cc: stable@vger.kernel.org -Link: https://lore.kernel.org/r/a1cc128e094db4ec141f85bd380127598dfef17e.1680760742.git.Takahiro.Kuwano@infineon.com -Signed-off-by: Tudor Ambarus -Signed-off-by: Greg Kroah-Hartman ---- - 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 9f1ba08b76c..ba2e0109213 100644 --- 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 index 054b25cd585..00000000000 --- 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 -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 - -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 -Signed-off-by: Takahiro Kuwano -Cc: stable@vger.kernel.org -Link: https://lore.kernel.org/r/a1cc128e094db4ec141f85bd380127598dfef17e.1680760742.git.Takahiro.Kuwano@infineon.com -Signed-off-by: Tudor Ambarus -Signed-off-by: Greg Kroah-Hartman ---- - 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 b97fe9645e3..80db4180431 100644 --- 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 -- 2.47.3