Commit 727d3782 authored by Marcel Ziswiler's avatar Marcel Ziswiler Committed by Miquel Raynal
Browse files

mtd: rawnand: reorder NAND manufacturer IDs 



Reorder NAND manufacturer IDs for clarity.

Signed-off-by: default avatarMarcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent 8ae3fbf8

drivers/mtd/nand/raw/internals.h

+14 −14
Original line number Diff line number Diff line
@@ -16,21 +16,21 @@ 
/*

 * NAND Flash Manufacturer ID Codes

 */

#define NAND_MFR_TOSHIBA	0x98

#define NAND_MFR_AMD		0x01

#define NAND_MFR_ATO		0x9b

#define NAND_MFR_EON		0x92

#define NAND_MFR_ESMT		0xc8

#define NAND_MFR_SAMSUNG	0xec

#define NAND_MFR_FUJITSU	0x04

#define NAND_MFR_NATIONAL	0x8f

#define NAND_MFR_RENESAS	0x07

#define NAND_MFR_STMICRO	0x20

#define NAND_MFR_HYNIX		0xad

#define NAND_MFR_MICRON		0x2c

#define NAND_MFR_AMD		0x01

#define NAND_MFR_INTEL		0x89

#define NAND_MFR_MACRONIX	0xc2

#define NAND_MFR_EON		0x92

#define NAND_MFR_MICRON		0x2c

#define NAND_MFR_NATIONAL	0x8f

#define NAND_MFR_RENESAS	0x07

#define NAND_MFR_SAMSUNG	0xec

#define NAND_MFR_SANDISK	0x45

#define NAND_MFR_INTEL		0x89

#define NAND_MFR_ATO		0x9b

#define NAND_MFR_STMICRO	0x20

#define NAND_MFR_TOSHIBA	0x98

#define NAND_MFR_WINBOND	0xef



/**
@@ -66,12 +66,12 @@ struct nand_manufacturer { 


extern struct nand_flash_dev nand_flash_ids[];



extern const struct nand_manufacturer_ops toshiba_nand_manuf_ops;

extern const struct nand_manufacturer_ops samsung_nand_manuf_ops;

extern const struct nand_manufacturer_ops hynix_nand_manuf_ops;

extern const struct nand_manufacturer_ops micron_nand_manuf_ops;

extern const struct nand_manufacturer_ops amd_nand_manuf_ops;

extern const struct nand_manufacturer_ops hynix_nand_manuf_ops;

extern const struct nand_manufacturer_ops macronix_nand_manuf_ops;

extern const struct nand_manufacturer_ops micron_nand_manuf_ops;

extern const struct nand_manufacturer_ops samsung_nand_manuf_ops;

extern const struct nand_manufacturer_ops toshiba_nand_manuf_ops;



/* Core functions */

const struct nand_manufacturer *nand_get_manufacturer(u8 id);

drivers/mtd/nand/raw/nand_ids.c

+10 −10
Original line number Diff line number Diff line
@@ -171,21 +171,21 @@ struct nand_flash_dev nand_flash_ids[] = { 


/* Manufacturer IDs */

static const struct nand_manufacturer nand_manufacturers[] = {

	{NAND_MFR_TOSHIBA, "Toshiba", &toshiba_nand_manuf_ops},

	{NAND_MFR_AMD, "AMD/Spansion", &amd_nand_manuf_ops},

	{NAND_MFR_ATO, "ATO"},

	{NAND_MFR_EON, "Eon"},

	{NAND_MFR_ESMT, "ESMT"},

	{NAND_MFR_SAMSUNG, "Samsung", &samsung_nand_manuf_ops},

	{NAND_MFR_FUJITSU, "Fujitsu"},

	{NAND_MFR_NATIONAL, "National"},

	{NAND_MFR_RENESAS, "Renesas"},

	{NAND_MFR_STMICRO, "ST Micro"},

	{NAND_MFR_HYNIX, "Hynix", &hynix_nand_manuf_ops},

	{NAND_MFR_MICRON, "Micron", &micron_nand_manuf_ops},

	{NAND_MFR_AMD, "AMD/Spansion", &amd_nand_manuf_ops},

	{NAND_MFR_INTEL, "Intel"},

	{NAND_MFR_MACRONIX, "Macronix", &macronix_nand_manuf_ops},

	{NAND_MFR_EON, "Eon"},

	{NAND_MFR_MICRON, "Micron", &micron_nand_manuf_ops},

	{NAND_MFR_NATIONAL, "National"},

	{NAND_MFR_RENESAS, "Renesas"},

	{NAND_MFR_SAMSUNG, "Samsung", &samsung_nand_manuf_ops},

	{NAND_MFR_SANDISK, "SanDisk"},

	{NAND_MFR_INTEL, "Intel"},

	{NAND_MFR_ATO, "ATO"},

	{NAND_MFR_STMICRO, "ST Micro"},

	{NAND_MFR_TOSHIBA, "Toshiba", &toshiba_nand_manuf_ops},

	{NAND_MFR_WINBOND, "Winbond"},

};