mtd: spi-nor: spansion: let SFDP determine the flash and sector size

sector_size is used to determine the flash size and the erase size in
case of uniform erase. n_sectors is used to determine the flash_size.
But the flash size and the erase sizes are determined when parsing SFDP,
let SFDP determine them.

Tested-by: Takahiro Kuwano <Takahiro.Kuwano@infineon.com>
Link: https://lore.kernel.org/r/20230726075257.12985-10-tudor.ambarus@linaro.org
Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org>

diff --git a/drivers/mtd/spi-nor/spansion.c b/drivers/mtd/spi-nor/spansion.c
index 1c5671a..30a3ffb 100644 (file)
--- a/drivers/mtd/spi-nor/spansion.c
+++ b/drivers/mtd/spi-nor/spansion.c
@@ -873,11 +873,11 @@ static const struct flash_info spansion_nor_parts[] = {
                PARSE_SFDP
                MFR_FLAGS(USE_CLPEF)
                .fixups = &s25fs256t_fixups },
-       { "s25hl512t",  INFO6(0x342a1a, 0x0f0390, 256 * 1024, 256)
+       { "s25hl512t",  INFO6(0x342a1a, 0x0f0390, 0, 0)
                PARSE_SFDP
                MFR_FLAGS(USE_CLPEF)
                .fixups = &s25hx_t_fixups },
-       { "s25hl01gt",  INFO6(0x342a1b, 0x0f0390, 256 * 1024, 512)
+       { "s25hl01gt",  INFO6(0x342a1b, 0x0f0390, 0, 0)
                PARSE_SFDP
                MFR_FLAGS(USE_CLPEF)
                .fixups = &s25hx_t_fixups },
@@ -886,11 +886,11 @@ static const struct flash_info spansion_nor_parts[] = {
                MFR_FLAGS(USE_CLPEF)
                FLAGS(NO_CHIP_ERASE)
                .fixups = &s25hx_t_fixups },
-       { "s25hs512t",  INFO6(0x342b1a, 0x0f0390, 256 * 1024, 256)
+       { "s25hs512t",  INFO6(0x342b1a, 0x0f0390, 0, 0)
                PARSE_SFDP
                MFR_FLAGS(USE_CLPEF)
                .fixups = &s25hx_t_fixups },
-       { "s25hs01gt",  INFO6(0x342b1b, 0x0f0390, 256 * 1024, 512)
+       { "s25hs01gt",  INFO6(0x342b1b, 0x0f0390, 0, 0)
                PARSE_SFDP
                MFR_FLAGS(USE_CLPEF)
                .fixups = &s25hx_t_fixups },
@@ -901,22 +901,22 @@ static const struct flash_info spansion_nor_parts[] = {
                .fixups = &s25hx_t_fixups },
        { "cy15x104q",  INFO6(0x042cc2, 0x7f7f7f, 512 * 1024, 1)
                FLAGS(SPI_NOR_NO_ERASE) },
-       { "s28hl512t",   INFO(0x345a1a,      0, 256 * 1024, 256)
+       { "s28hl512t",   INFO(0x345a1a,      0, 0, 0)
                PARSE_SFDP
                MFR_FLAGS(USE_CLPEF)
                .fixups = &s28hx_t_fixups,
        },
-       { "s28hl01gt",   INFO(0x345a1b,      0, 256 * 1024, 512)
+       { "s28hl01gt",   INFO(0x345a1b,      0, 0, 0)
                PARSE_SFDP
                MFR_FLAGS(USE_CLPEF)
                .fixups = &s28hx_t_fixups,
        },
-       { "s28hs512t",   INFO(0x345b1a,      0, 256 * 1024, 256)
+       { "s28hs512t",   INFO(0x345b1a,      0, 0, 0)
                PARSE_SFDP
                MFR_FLAGS(USE_CLPEF)
                .fixups = &s28hx_t_fixups,
        },
-       { "s28hs01gt",   INFO(0x345b1b,      0, 256 * 1024, 512)
+       { "s28hs01gt",   INFO(0x345b1b,      0, 0, 0)
                PARSE_SFDP
                MFR_FLAGS(USE_CLPEF)
                .fixups = &s28hx_t_fixups,