diff options
| author | Takahiro Kuwano <[email protected]> | 2024-10-15 13:08:33 +0900 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-10-15 08:57:49 -0600 |
| commit | b8b610e7d4c5e086f7e97592878527adfa744075 (patch) | |
| tree | 35c0e12fffcba8c9a14fa3bbc42bc7607f3bb6e1 | |
| parent | 88057dab2cde8710ccc95d12fb312184e0b023ca (diff) | |
mtd: spi-nor: Check nor->info before setting macronix_octal_fixups
The macronix_octal_fixups should be set only when mfr and flags match.
Fixes: df3d5f9e41 ("mtd: spi-nor: add support for Macronix Octal flash")
Acked-by: Tudor Ambarus <[email protected]>
Signed-off-by: Takahiro Kuwano <[email protected]>
Cc: JaimeLiao <[email protected]>
| -rw-r--r-- | drivers/mtd/spi/spi-nor-core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c index d39d0ee7813..466729cd2a7 100644 --- a/drivers/mtd/spi/spi-nor-core.c +++ b/drivers/mtd/spi/spi-nor-core.c @@ -4423,7 +4423,9 @@ void spi_nor_set_fixups(struct spi_nor *nor) #endif #if CONFIG_IS_ENABLED(SPI_FLASH_MACRONIX) - nor->fixups = ¯onix_octal_fixups; + if (JEDEC_MFR(nor->info) == SNOR_MFR_MACRONIX && + nor->info->flags & SPI_NOR_OCTAL_DTR_READ) + nor->fixups = ¯onix_octal_fixups; #endif /* SPI_FLASH_MACRONIX */ } |