Commit 25f643a3 authored by Miquel Raynal's avatar Miquel Raynal
Browse files

mtd: spinand: winbond: Sort the devices 



Use alphabetical order, not because it's pretty, but because it makes
sense. This way the devices are listed by density, and then by hardware
feature set. Add comments to make the list more understandable.

There is no intended functional change.

Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: default avatarFrieder Schrempf <frieder.schrempf@kontron.de>
Link: https://lore.kernel.org/linux-mtd/20241009125002.191109-5-miquel.raynal@bootlin.com
parent ff97ceb6

drivers/mtd/nand/spi/winbond.c

+48 −35
Original line number Diff line number Diff line
@@ -161,17 +161,18 @@ static int w25n02kv_ecc_get_status(struct spinand_device *spinand, 
}



static const struct spinand_info winbond_spinand_table[] = {

	SPINAND_INFO("W25M02GV",

		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xab, 0x21),

		     NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 2),

	/* 512M-bit densities */

	SPINAND_INFO("W25N512GW", /* 1.8V */

		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xba, 0x20),

		     NAND_MEMORG(1, 2048, 64, 64, 512, 10, 1, 1, 1),

		     NAND_ECCREQ(1, 512),

		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,

					      &write_cache_variants,

					      &update_cache_variants),

		     0,

		     SPINAND_ECCINFO(&w25m02gv_ooblayout, NULL),

		     SPINAND_SELECT_TARGET(w25m02gv_select_target)),

	SPINAND_INFO("W25N01GV",

		     SPINAND_ECCINFO(&w25m02gv_ooblayout, NULL)),

	/* 1G-bit densities */

	SPINAND_INFO("W25N01GV", /* 3.3V */

		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xaa, 0x21),

		     NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 1),

		     NAND_ECCREQ(1, 512),
@@ -180,34 +181,45 @@ static const struct spinand_info winbond_spinand_table[] = { 
					      &update_cache_variants),

		     0,

		     SPINAND_ECCINFO(&w25m02gv_ooblayout, NULL)),

	SPINAND_INFO("W25N01KV",

		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xae, 0x21),

		     NAND_MEMORG(1, 2048, 96, 64, 1024, 20, 1, 1, 1),

		     NAND_ECCREQ(4, 512),

	SPINAND_INFO("W25N01GW", /* 1.8V */

		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xba, 0x21),

		     NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 1),

		     NAND_ECCREQ(1, 512),

		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,

					      &write_cache_variants,

					      &update_cache_variants),

		     0,

		     SPINAND_ECCINFO(&w25n01kv_ooblayout, w25n02kv_ecc_get_status)),

	SPINAND_INFO("W25N02KV",

		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xaa, 0x22),

		     NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1),

		     NAND_ECCREQ(8, 512),

		     SPINAND_ECCINFO(&w25m02gv_ooblayout, NULL)),

	SPINAND_INFO("W25N01JW", /* high-speed 1.8V */

		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xbc, 0x21),

		     NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 1),

		     NAND_ECCREQ(1, 512),

		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,

					      &write_cache_variants,

					      &update_cache_variants),

		     0,

		     SPINAND_ECCINFO(&w25n02kv_ooblayout, w25n02kv_ecc_get_status)),

	SPINAND_INFO("W25N01JW",

		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xbc, 0x21),

		     NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 1),

		     SPINAND_ECCINFO(&w25m02gv_ooblayout, NULL)),

	SPINAND_INFO("W25N01KV", /* 3.3V */

		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xae, 0x21),

		     NAND_MEMORG(1, 2048, 96, 64, 1024, 20, 1, 1, 1),

		     NAND_ECCREQ(4, 512),

		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,

					      &write_cache_variants,

					      &update_cache_variants),

		     0,

		     SPINAND_ECCINFO(&w25n01kv_ooblayout, w25n02kv_ecc_get_status)),

	/* 2G-bit densities */

	SPINAND_INFO("W25M02GV", /* 2x1G-bit 3.3V */

		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xab, 0x21),

		     NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 2),

		     NAND_ECCREQ(1, 512),

		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,

					      &write_cache_variants,

					      &update_cache_variants),

		     0,

		     SPINAND_ECCINFO(&w25m02gv_ooblayout, NULL)),

	SPINAND_INFO("W25N02JW",

		     SPINAND_ECCINFO(&w25m02gv_ooblayout, NULL),

		     SPINAND_SELECT_TARGET(w25m02gv_select_target)),

	SPINAND_INFO("W25N02JW", /* high-speed 1.8V */

		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xbf, 0x22),

		     NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 2, 1),

		     NAND_ECCREQ(1, 512),
@@ -216,16 +228,16 @@ static const struct spinand_info winbond_spinand_table[] = { 
					      &update_cache_variants),

		     0,

		     SPINAND_ECCINFO(&w25m02gv_ooblayout, NULL)),

	SPINAND_INFO("W25N512GW",

		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xba, 0x20),

		     NAND_MEMORG(1, 2048, 64, 64, 512, 10, 1, 1, 1),

		     NAND_ECCREQ(1, 512),

	SPINAND_INFO("W25N02KV", /* 3.3V */

		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xaa, 0x22),

		     NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1),

		     NAND_ECCREQ(8, 512),

		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,

					      &write_cache_variants,

					      &update_cache_variants),

		     0,

		     SPINAND_ECCINFO(&w25m02gv_ooblayout, NULL)),

	SPINAND_INFO("W25N02KW",

		     SPINAND_ECCINFO(&w25n02kv_ooblayout, w25n02kv_ecc_get_status)),

	SPINAND_INFO("W25N02KW", /* 1.8V */

		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xba, 0x22),

		     NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1),

		     NAND_ECCREQ(8, 512),
@@ -234,18 +246,19 @@ static const struct spinand_info winbond_spinand_table[] = { 
					      &update_cache_variants),

		     0,

		     SPINAND_ECCINFO(&w25n02kv_ooblayout, w25n02kv_ecc_get_status)),

	SPINAND_INFO("W25N01GW",

		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xba, 0x21),

		     NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 1),

		     NAND_ECCREQ(1, 512),

	/* 4G-bit densities */

	SPINAND_INFO("W25N04KV", /* 3.3V */

		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xaa, 0x23),

		     NAND_MEMORG(1, 2048, 128, 64, 4096, 40, 2, 1, 1),

		     NAND_ECCREQ(8, 512),

		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,

					      &write_cache_variants,

					      &update_cache_variants),

		     0,

		     SPINAND_ECCINFO(&w25m02gv_ooblayout, NULL)),

	SPINAND_INFO("W25N04KV",

		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xaa, 0x23),

		     NAND_MEMORG(1, 2048, 128, 64, 4096, 40, 2, 1, 1),

		     SPINAND_ECCINFO(&w25n02kv_ooblayout, w25n02kv_ecc_get_status)),

	SPINAND_INFO("W25N04KW", /* 1.8V */

		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xba, 0x23),

		     NAND_MEMORG(1, 2048, 128, 64, 4096, 40, 1, 1, 1),

		     NAND_ECCREQ(8, 512),

		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,

					      &write_cache_variants,