Commit cc59e6bb authored by Yicong Yang's avatar Yicong Yang Committed by Tudor Ambarus
Browse files

mtd: spi-nor: Disable the flash quad mode in spi_nor_restore() 



If the flash's quad mode is enabled, it'll remain in the quad mode when
it's removed. If we drive the flash next time in Standard/Dual SPI mode,
the QE bit is not cleared and the function of flash's WP# and RESET#/HOLD#
have been switched to IO2 and IO3 and are not restored.

Disable the Quad mode in spi_nor_restore(), then the flash's QE bit will
be cleared when removed. This will make sure the flash always enter the
Standard/Dual SPI mode when loaded.

Signed-off-by: default avatarYicong Yang <yangyicong@hisilicon.com>
Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Reviewed-by: default avatarPratyush Yadav <p.yadav@ti.com>
Link: https://lore.kernel.org/r/1594027356-19088-3-git-send-email-yangyicong@hisilicon.com
parent be192209

drivers/mtd/spi-nor/core.c

+2 −0
Original line number Diff line number Diff line
@@ -3000,6 +3000,8 @@ void spi_nor_restore(struct spi_nor *nor) 
	if (nor->addr_width == 4 && !(nor->flags & SNOR_F_4B_OPCODES) &&

	    nor->flags & SNOR_F_BROKEN_RESET)

		nor->params->set_4byte_addr_mode(nor, false);



	spi_nor_quad_enable(nor, false);

}

EXPORT_SYMBOL_GPL(spi_nor_restore);