Remove undocumented SST special case. This was added in commit 5d40b3d384dc ("mtd: spi-nor: Add parallel and stacked memories support") without any explanation in the commit message. Remove it.
Fixes: 5d40b3d384dc ("mtd: spi-nor: Add parallel and stacked memories support") Signed-off-by: Marek Vasut <marek.vasut+rene...@mailbox.org> --- Cc: Andre Przywara <andre.przyw...@arm.com> Cc: Ashok Reddy Soma <ashok.reddy.s...@amd.com> Cc: Jagan Teki <ja...@amarulasolutions.com> Cc: Michael Walle <mwa...@kernel.org> Cc: Michal Simek <michal.si...@amd.com> Cc: Patrice Chotard <patrice.chot...@foss.st.com> Cc: Patrick Delaunay <patrick.delau...@foss.st.com> Cc: Pratyush Yadav <p.ya...@ti.com> Cc: Quentin Schulz <quentin.sch...@cherry.de> Cc: Sean Anderson <sean...@gmail.com> Cc: Simon Glass <s...@chromium.org> Cc: Takahiro Kuwano <takahiro.kuw...@infineon.com> Cc: Tom Rini <tr...@konsulko.com> Cc: Tudor Ambarus <tudor.amba...@linaro.org> Cc: Venkatesh Yadav Abbarapu <venkatesh.abbar...@amd.com> Cc: u-boot@lists.denx.de Cc: uboot-st...@st-md-mailman.stormreply.com --- drivers/mtd/spi/spi-nor-core.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c index d22363e8267..3c47751348e 100644 --- a/drivers/mtd/spi/spi-nor-core.c +++ b/drivers/mtd/spi/spi-nor-core.c @@ -3578,19 +3578,6 @@ static int spi_nor_select_erase(struct spi_nor *nor, mtd->erasesize = info->sector_size; } - if ((JEDEC_MFR(info) == SNOR_MFR_SST) && info->flags & SECT_4K) { - nor->erase_opcode = SPINOR_OP_BE_4K; - /* - * In parallel-memories the erase operation is - * performed on both the flashes simultaneously - * so, double the erasesize. - */ - if (nor->flags & SNOR_F_HAS_PARALLEL) - mtd->erasesize = 4096 * 2; - else - mtd->erasesize = 4096; - } - return 0; } -- 2.45.2