summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVignesh Raghavendra <vigneshr@ti.com>2020-01-08 10:43:43 +0530
committerMiquel Raynal <miquel.raynal@bootlin.com>2020-01-17 22:44:49 +0100
commit440b6d50254bdbd84c2a665c7f53ec69dd741a4f (patch)
treed0ecbde1062ff2d389cf22c189a22f9f418a7089
parentb3a987b0264d3ddbb24293ebff10eddfc472f653 (diff)
downloadlinux-440b6d50254bdbd84c2a665c7f53ec69dd741a4f.tar.bz2
mtd: spi-nor: Fix selection of 4-byte addressing opcodes on Spansion
mtd->size is still unassigned when running spansion_post_sfdp_fixups() hook, therefore use nor->params.size to determine the size of flash device. This makes sure that 4-byte addressing opcodes are used on Spansion flashes that are larger than 16MiB and don't have SFDP 4BAIT table populated. Fixes: 92094ebc385e ("mtd: spi-nor: Add spansion_post_sfdp_fixups()") Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com> Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
-rw-r--r--drivers/mtd/spi-nor/spi-nor.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index aeb3ad2dbfb8..97f68d70cd23 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -4769,9 +4769,7 @@ static void spi_nor_info_init_params(struct spi_nor *nor)
static void spansion_post_sfdp_fixups(struct spi_nor *nor)
{
- struct mtd_info *mtd = &nor->mtd;
-
- if (mtd->size <= SZ_16M)
+ if (nor->params.size <= SZ_16M)
return;
nor->flags |= SNOR_F_4B_OPCODES;