From 0afeae23f26430b86a2f1fbef624b8f86999476a Mon Sep 17 00:00:00 2001 From: Jon Lin Date: Fri, 16 Aug 2019 10:12:43 +0800 Subject: [PATCH] drivers: rkflash: support snor_disable_QE for new devices Change-Id: I67dcf1791097a7742f8396eb42a59f932b89d4ba Signed-off-by: Jon Lin --- drivers/rkflash/sfc_nor.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/rkflash/sfc_nor.c b/drivers/rkflash/sfc_nor.c index 932149d42095..69e88ec0cfe7 100644 --- a/drivers/rkflash/sfc_nor.c +++ b/drivers/rkflash/sfc_nor.c @@ -375,7 +375,11 @@ int snor_disable_QE(struct SFNOR_DEV *p_dev) u8 status; if (p_dev->manufacturer == MID_GIGADEV || - p_dev->manufacturer == MID_WINBOND) { + p_dev->manufacturer == MID_WINBOND || + p_dev->manufacturer == MID_XTX || + p_dev->manufacturer == MID_MACRONIX || + p_dev->manufacturer == MID_PUYA || + p_dev->manufacturer == MID_XMC) { reg_index = p_dev->QE_bits >> 3; bit_offset = p_dev->QE_bits & 0x7; ret = snor_read_status(reg_index, &status); @@ -652,6 +656,7 @@ int snor_init(struct SFNOR_DEV *p_dev) p_dev->prog_lines = DATA_LINES_X1; p_dev->read_lines = DATA_LINES_X1; p_dev->QE_bits = g_spi_flash_info->QE_bits; + p_dev->addr_mode = ADDR_MODE_3BYTE; i = g_spi_flash_info->feature & FEA_READ_STATUE_MASK; if (i == 0)