Unverified Commit 8e52f54c authored by Michael Walle's avatar Michael Walle Committed by Tudor Ambarus
Browse files

mtd: spi-nor: xilinx: use new macros in S3AN_INFO() 



There won't be any new entries, nor are the entries that much different
and the very odd page and sector sizes make the new format hard to read.
Therefore, convert the old S3AN_INFO() macro.

Signed-off-by: default avatarMichael Walle <mwalle@kernel.org>
Link: https://lore.kernel.org/r/20230807-mtd-flash-info-db-rework-v3-29-e60548861b10@kernel.org


Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@linaro.org>
parent 348d772d

drivers/mtd/spi-nor/xilinx.c

+12 −11
Original line number Diff line number Diff line
@@ -21,8 +21,9 @@ 
		   SPI_MEM_OP_NO_DUMMY,					\

		   SPI_MEM_OP_DATA_IN(1, buf, 0))



#define S3AN_INFO(_jedec_id, _n_sectors, _page_size)			\

		SPI_NOR_ID(_jedec_id, 0),				\

#define S3AN_FLASH(_id, _name, _n_sectors, _page_size)		\

	.id = _id,						\

	.name = _name,						\

	.size = 8 * (_page_size) * (_n_sectors),		\

	.sector_size = (8 * (_page_size)),			\

	.page_size = (_page_size),				\
@@ -31,11 +32,11 @@ 
/* Xilinx S3AN share MFR with Atmel SPI NOR */

static const struct flash_info xilinx_nor_parts[] = {

	/* Xilinx S3AN Internal Flash */

	{ "3S50AN", S3AN_INFO(0x1f2200, 64, 264) },

	{ "3S200AN", S3AN_INFO(0x1f2400, 256, 264) },

	{ "3S400AN", S3AN_INFO(0x1f2400, 256, 264) },

	{ "3S700AN", S3AN_INFO(0x1f2500, 512, 264) },

	{ "3S1400AN", S3AN_INFO(0x1f2600, 512, 528) },

	{ S3AN_FLASH(SNOR_ID(0x1f, 0x22, 0x00), "3S50AN", 64, 264) },

	{ S3AN_FLASH(SNOR_ID(0x1f, 0x24, 0x00), "3S200AN", 256, 264) },

	{ S3AN_FLASH(SNOR_ID(0x1f, 0x24, 0x00), "3S400AN", 256, 264) },

	{ S3AN_FLASH(SNOR_ID(0x1f, 0x25, 0x00), "3S700AN", 512, 264) },

	{ S3AN_FLASH(SNOR_ID(0x1f, 0x26, 0x00), "3S1400AN", 512, 528) },

};



/*