[PATCH 1/2] mtd: spi-nor: add Manufacturer ID for Micron

[Brian Norris]

On Thu, Dec 10, 2015 at 01:58:59AM +0000, Karl Zhang wrote:
> Micron Manufacturer ID assigned by JEDEC is 2Ch.
> Add this ID, for new Spi NOR from Micron.
> 
> ST's ID(20h) is Micron due to the history.
> 
> Signed-off-by: Karl Zhang <karlzhang at micron.com>
> ---
>  include/linux/mtd/cfi.h     | 1 +
>  include/linux/mtd/spi-nor.h | 2 ++
>  2 files changed, 3 insertions(+)
> 
> diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h
> index 9b57a9b..cbf7716 100644
> --- a/include/linux/mtd/cfi.h
> +++ b/include/linux/mtd/cfi.h
> @@ -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
>  
> diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h
> index fac3f6f..b858e93 100644
> --- a/include/linux/mtd/spi-nor.h
> +++ b/include/linux/mtd/spi-nor.h
> @@ -22,6 +22,8 @@
>   */
>  #define SNOR_MFR_ATMEL		CFI_MFR_ATMEL
>  #define SNOR_MFR_INTEL		CFI_MFR_INTEL
> +/* Micron Manufacturer ID assigned by JEDEC */
> +#define SNOR_MFR_MICRON_JEDEC	CFI_MFR_MICRON

Is this the ID Micron is going to use going forward?

Brian

>  #define SNOR_MFR_MICRON		CFI_MFR_ST /* ST Micro <--> Micron */
>  #define SNOR_MFR_MACRONIX	CFI_MFR_MACRONIX
>  #define SNOR_MFR_SPANSION	CFI_MFR_AMD
> -- 
> 1.9.1
>