Hiya, On 07.09.2024 00:10, Marek Vasut wrote: > The mx25u25635f entry exists twice in spi_nor_ids, remove the less > complete variant of the entry and keep only one copy of it. > > Fixes: f0084f1dfdbc ("drivers/mtd/spi/spi-nor-ids.c: add mx25u25635f support")
Or one can directly revert the offending commit as it dropped support for the 4b opcodes. Looks good anyway: Reviewed-by: Tudor Ambarus <tudor.amba...@linaro.org> > Signed-off-by: Marek Vasut <ma...@denx.de> > Reviewed-by: Michal Simek <michal.si...@amd.com> > --- > Cc: Andre Przywara <andre.przyw...@arm.com> > Cc: Ashok Reddy Soma <ashok.reddy.s...@amd.com> > Cc: Dhruva Gole <d-g...@ti.com> > Cc: Jagan Teki <ja...@amarulasolutions.com> > Cc: Jim Liu <jim.t90...@gmail.com> > Cc: Jonas Karlman <jo...@kwiboo.se> > Cc: Michal Simek <michal.si...@amd.com> > Cc: Neal Frager <neal.fra...@amd.com> > Cc: Prasad Kummari <prasad.kumm...@amd.com> > Cc: Teik Heng Chong <teik.heng.ch...@intel.com> > Cc: Tom Rini <tr...@konsulko.com> > Cc: Vignesh R <vigne...@ti.com> > Cc: u-boot@lists.denx.de > --- > drivers/mtd/spi/spi-nor-ids.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/mtd/spi/spi-nor-ids.c b/drivers/mtd/spi/spi-nor-ids.c > index d1389e681d6..5582a978ab5 100644 > --- a/drivers/mtd/spi/spi-nor-ids.c > +++ b/drivers/mtd/spi/spi-nor-ids.c > @@ -258,7 +258,6 @@ const struct flash_info spi_nor_ids[] = { > { INFO("mx25u6435f", 0xc22537, 0, 64 * 1024, 128, SECT_4K) }, > { INFO("mx25l12805d", 0xc22018, 0, 64 * 1024, 256, SECT_4K) }, > { INFO("mx25u12835f", 0xc22538, 0, 64 * 1024, 256, SECT_4K) }, > - { INFO("mx25u25635f", 0xc22539, 0, 64 * 1024, 512, SECT_4K) }, > { INFO("mx25u51245g", 0xc2253a, 0, 64 * 1024, 1024, SECT_4K | > SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) }, > { INFO("mx25l12855e", 0xc22618, 0, 64 * 1024, 256, 0) },