| Message ID | 20240711-macronix-mx25l3205d-fixups-v3-15-99353461dd2d@geanix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mtd: spi-nor: macronix: workaround for device id re-use | expand |
Esben Haabendal <esben@geanix.com> writes: > With the implementation of SPI_NOR_TRY_SFDP flag, the removal of the > deprecated mechanism for trying SFDP parsing, and the alignment of > ->default_init() hooks handling, the SPI_NOR_SKIP_SFDP flag has become a > no-op, so it can safely be removed. > > Signed-off-by: Esben Haabendal <esben@geanix.com> Should I split this into a commit for the spansion change, and one for the core change? /Esben > --- > drivers/mtd/spi-nor/core.c | 2 +- > drivers/mtd/spi-nor/core.h | 5 +---- > drivers/mtd/spi-nor/spansion.c | 2 +- > 3 files changed, 3 insertions(+), 6 deletions(-) > > diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c > index d58f107f62ec..518b2707ce80 100644 > --- a/drivers/mtd/spi-nor/core.c > +++ b/drivers/mtd/spi-nor/core.c > @@ -3024,7 +3024,7 @@ static int spi_nor_init_params(struct spi_nor *nor) > if (spi_nor_needs_sfdp(nor)) { > ret = spi_nor_parse_sfdp(nor); > if (ret) { > - dev_err(nor->dev, "BFPT parsing failed. Please consider using SPI_NOR_SKIP_SFDP or SPI_NOR_TRY_SFDP when declaring the flash\n"); > + dev_err(nor->dev, "BFPT parsing failed. Please consider using SPI_NOR_TRY_SFDP when declaring the flash\n"); > return ret; > } > } else { > diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h > index f4a76f42051a..ae10e12e9078 100644 > --- a/drivers/mtd/spi-nor/core.h > +++ b/drivers/mtd/spi-nor/core.h > @@ -485,9 +485,7 @@ struct spi_nor_id { > * > * @no_sfdp_flags: flags that indicate support that can be discovered via SFDP. > * Used when SFDP tables are not defined in the flash. These > - * flags are used together with the SPI_NOR_SKIP_SFDP or > - * SPI_NOR_TRY_SFDP flag. > - * SPI_NOR_SKIP_SFDP: skip parsing of SFDP tables. > + * flags are used together with the SPI_NOR_TRY_SFDP flag. > * SECT_4K: SPINOR_OP_BE_4K works uniformly. > * SPI_NOR_TRY_SFDP: try parsing SFDP tables before using the > * parameters specified in this struct. > @@ -536,7 +534,6 @@ struct flash_info { > #define SPI_NOR_RWW BIT(9) > > u8 no_sfdp_flags; > -#define SPI_NOR_SKIP_SFDP BIT(0) > #define SECT_4K BIT(1) > #define SPI_NOR_TRY_SFDP BIT(2) > #define SPI_NOR_DUAL_READ BIT(3) > diff --git a/drivers/mtd/spi-nor/spansion.c b/drivers/mtd/spi-nor/spansion.c > index a58c0229003d..afcb684ffe4d 100644 > --- a/drivers/mtd/spi-nor/spansion.c > +++ b/drivers/mtd/spi-nor/spansion.c > @@ -793,7 +793,7 @@ static const struct flash_info spansion_nor_parts[] = { > .name = "s25fl256s0", > .size = SZ_32M, > .sector_size = SZ_256K, > - .no_sfdp_flags = SPI_NOR_SKIP_SFDP | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ, > + .no_sfdp_flags = SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ, > .mfr_flags = USE_CLSR, > }, { > .id = SNOR_ID(0x01, 0x02, 0x19, 0x4d, 0x00, 0x81),
diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c index d58f107f62ec..518b2707ce80 100644 --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c @@ -3024,7 +3024,7 @@ static int spi_nor_init_params(struct spi_nor *nor) if (spi_nor_needs_sfdp(nor)) { ret = spi_nor_parse_sfdp(nor); if (ret) { - dev_err(nor->dev, "BFPT parsing failed. Please consider using SPI_NOR_SKIP_SFDP or SPI_NOR_TRY_SFDP when declaring the flash\n"); + dev_err(nor->dev, "BFPT parsing failed. Please consider using SPI_NOR_TRY_SFDP when declaring the flash\n"); return ret; } } else { diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h index f4a76f42051a..ae10e12e9078 100644 --- a/drivers/mtd/spi-nor/core.h +++ b/drivers/mtd/spi-nor/core.h @@ -485,9 +485,7 @@ struct spi_nor_id { * * @no_sfdp_flags: flags that indicate support that can be discovered via SFDP. * Used when SFDP tables are not defined in the flash. These - * flags are used together with the SPI_NOR_SKIP_SFDP or - * SPI_NOR_TRY_SFDP flag. - * SPI_NOR_SKIP_SFDP: skip parsing of SFDP tables. + * flags are used together with the SPI_NOR_TRY_SFDP flag. * SECT_4K: SPINOR_OP_BE_4K works uniformly. * SPI_NOR_TRY_SFDP: try parsing SFDP tables before using the * parameters specified in this struct. @@ -536,7 +534,6 @@ struct flash_info { #define SPI_NOR_RWW BIT(9) u8 no_sfdp_flags; -#define SPI_NOR_SKIP_SFDP BIT(0) #define SECT_4K BIT(1) #define SPI_NOR_TRY_SFDP BIT(2) #define SPI_NOR_DUAL_READ BIT(3) diff --git a/drivers/mtd/spi-nor/spansion.c b/drivers/mtd/spi-nor/spansion.c index a58c0229003d..afcb684ffe4d 100644 --- a/drivers/mtd/spi-nor/spansion.c +++ b/drivers/mtd/spi-nor/spansion.c @@ -793,7 +793,7 @@ static const struct flash_info spansion_nor_parts[] = { .name = "s25fl256s0", .size = SZ_32M, .sector_size = SZ_256K, - .no_sfdp_flags = SPI_NOR_SKIP_SFDP | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ, + .no_sfdp_flags = SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ, .mfr_flags = USE_CLSR, }, { .id = SNOR_ID(0x01, 0x02, 0x19, 0x4d, 0x00, 0x81),
With the implementation of SPI_NOR_TRY_SFDP flag, the removal of the deprecated mechanism for trying SFDP parsing, and the alignment of ->default_init() hooks handling, the SPI_NOR_SKIP_SFDP flag has become a no-op, so it can safely be removed. Signed-off-by: Esben Haabendal <esben@geanix.com> --- drivers/mtd/spi-nor/core.c | 2 +- drivers/mtd/spi-nor/core.h | 5 +---- drivers/mtd/spi-nor/spansion.c | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-)