diff options
| author | Han Xu <han.xu@nxp.com> | 2018-08-07 11:50:08 -0500 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:33:11 +0800 |
| commit | 85f934e7918ed6591c8cbcc68b6ddb7bd0acf85a (patch) | |
| tree | 30dac44efca428fb3f21d97d6ab9c40de6d9a585 /drivers/mtd | |
| parent | b3e9cfe1d52d1ecf08eebcb958736b250976c8a9 (diff) | |
MLK-15052-4: mtd: spi-nor: fix the micron/st issue
Some MICRON related macros in spi-nor domain were ST, actually. We
need to add the REAL micron defination in header/source files for
mt35xu512aba Micron Octal Nor chip.
Signed-off-by: Han Xu <han.xu@nxp.com>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/spi-nor/spi-nor.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index b22076b9a059..80eafdab067f 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -283,6 +283,7 @@ static inline int set_4byte(struct spi_nor *nor, const struct flash_info *info, switch (JEDEC_MFR(info)) { case SNOR_MFR_MICRON: + case SNOR_MFR_MICRONO: /* Some Micron need WREN command; all will accept it */ need_wren = true; case SNOR_MFR_MACRONIX: @@ -2460,6 +2461,7 @@ static int spi_nor_init_params(struct spi_nor *nor, break; case SNOR_MFR_MICRON: + case SNOR_MFR_MICRONO: break; default: @@ -2783,6 +2785,7 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, /* NOR protection support for STmicro/Micron chips and similar */ if (JEDEC_MFR(info) == SNOR_MFR_MICRON || + JEDEC_MFR(info) == SNOR_MFR_MICRONO || info->flags & SPI_NOR_HAS_LOCK) { nor->flash_lock = stm_lock; nor->flash_unlock = stm_unlock; |