Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0005aad0 authored by Yogesh Narayan Gaur's avatar Yogesh Narayan Gaur Committed by Boris Brezillon
Browse files

mtd: spi-nor: add macros related to MICRON flash 



Some MICRON related macros in spi-nor domain were ST.
Rename entries related to STMicroelectronics under macro SNOR_MFR_ST.

Added entry of MFR Id for Micron flashes, 0x002C.

Signed-off-by: default avatarYogesh Gaur <yogeshnarayan.gaur@nxp.com>
Reviewed-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
parent f66734ae

drivers/mtd/spi-nor/spi-nor.c

+6 −3
Original line number Diff line number Diff line
@@ -284,6 +284,7 @@ static inline int set_4byte(struct spi_nor *nor, const struct flash_info *info, 
	u8 cmd;



	switch (JEDEC_MFR(info)) {

	case SNOR_MFR_ST:

	case SNOR_MFR_MICRON:

		/* Some Micron need WREN command; all will accept it */

		need_wren = true;
@@ -1391,7 +1392,7 @@ static const struct flash_info spi_nor_ids[] = { 
	{ "mx66l1g45g",  INFO(0xc2201b, 0, 64 * 1024, 2048, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },

	{ "mx66l1g55g",  INFO(0xc2261b, 0, 64 * 1024, 2048, SPI_NOR_QUAD_READ) },



	/* Micron */

	/* Micron <--> ST Micro */

	{ "n25q016a",	 INFO(0x20bb15, 0, 64 * 1024,   32, SECT_4K | SPI_NOR_QUAD_READ) },

	{ "n25q032",	 INFO(0x20ba16, 0, 64 * 1024,   64, SPI_NOR_QUAD_READ) },

	{ "n25q032a",	 INFO(0x20bb16, 0, 64 * 1024,   64, SPI_NOR_QUAD_READ) },
@@ -3324,6 +3325,7 @@ static int spi_nor_init_params(struct spi_nor *nor, 
			params->quad_enable = macronix_quad_enable;

			break;



		case SNOR_MFR_ST:

		case SNOR_MFR_MICRON:

			break;
@@ -3774,7 +3776,8 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, 
	mtd->_resume = spi_nor_resume;



	/* NOR protection support for STmicro/Micron chips and similar */

	if (JEDEC_MFR(info) == SNOR_MFR_MICRON ||

	if (JEDEC_MFR(info) == SNOR_MFR_ST ||

	    JEDEC_MFR(info) == SNOR_MFR_MICRON ||

	    info->flags & SPI_NOR_HAS_LOCK) {

		nor->flash_lock = stm_lock;

		nor->flash_unlock = stm_unlock;

include/linux/mtd/cfi.h

+1 −0
Original line number Diff line number Diff line
@@ -377,6 +377,7 @@ struct cfi_fixup { 
#define CFI_MFR_SHARP		0x00B0

#define CFI_MFR_SST		0x00BF

#define CFI_MFR_ST		0x0020 /* STMicroelectronics */

#define CFI_MFR_MICRON		0x002C /* Micron */

#define CFI_MFR_TOSHIBA		0x0098

#define CFI_MFR_WINBOND		0x00DA

include/linux/mtd/spi-nor.h

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ 
#define SNOR_MFR_ATMEL		CFI_MFR_ATMEL

#define SNOR_MFR_GIGADEVICE	0xc8

#define SNOR_MFR_INTEL		CFI_MFR_INTEL

#define SNOR_MFR_MICRON		CFI_MFR_ST /* ST Micro <--> Micron */

#define SNOR_MFR_ST		CFI_MFR_ST	/* ST Micro */

#define SNOR_MFR_MICRON		CFI_MFR_MICRON	/* Micron */

#define SNOR_MFR_MACRONIX	CFI_MFR_MACRONIX

#define SNOR_MFR_SPANSION	CFI_MFR_AMD

#define SNOR_MFR_SST		CFI_MFR_SST