Commit b206b82d authored by Michael Walle's avatar Michael Walle Committed by Tudor Ambarus
Browse files

mtd: spi-nor: winbond: add OTP support to w25q32fw/jw 



With all the helper functions in place, add OTP support for the Winbond
W25Q32JW and W25Q32FW.

Both were tested on a LS1028A SoC with a NXP FSPI controller.

Signed-off-by: default avatarMichael Walle <michael@walle.cc>
Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Link: https://lore.kernel.org/r/20210321235140.8308-4-michael@walle.cc
parent cad3193f

drivers/mtd/spi-nor/winbond.c

+15 −2
Original line number Diff line number Diff line
@@ -54,14 +54,18 @@ static const struct flash_info winbond_parts[] = { 
	{ "w25q32", INFO(0xef4016, 0, 64 * 1024,  64, SECT_4K) },

	{ "w25q32dw", INFO(0xef6016, 0, 64 * 1024,  64,

			   SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |

			   SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },

			   SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)

			   OTP_INFO(256, 3, 0x1000, 0x1000)

	},



	{ "w25q32jv", INFO(0xef7016, 0, 64 * 1024,  64,

			   SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |

			   SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)

	},

	{ "w25q32jwm", INFO(0xef8016, 0, 64 * 1024,  64,

			    SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |

			    SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },

			    SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)

			    OTP_INFO(256, 3, 0x1000, 0x1000) },

	{ "w25q64jwm", INFO(0xef8017, 0, 64 * 1024, 128,

			    SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |

			    SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },
@@ -132,9 +136,18 @@ static int winbond_set_4byte_addr_mode(struct spi_nor *nor, bool enable) 
	return spi_nor_write_disable(nor);

}



static const struct spi_nor_otp_ops winbond_otp_ops = {

	.read = spi_nor_otp_read_secr,

	.write = spi_nor_otp_write_secr,

	.lock = spi_nor_otp_lock_sr2,

	.is_locked = spi_nor_otp_is_locked_sr2,

};



static void winbond_default_init(struct spi_nor *nor)

{

	nor->params->set_4byte_addr_mode = winbond_set_4byte_addr_mode;

	if (nor->params->otp.org->n_regions)

		nor->params->otp.ops = &winbond_otp_ops;

}



static const struct spi_nor_fixups winbond_fixups = {