From f3dc0964197c4e5d31e6d64add40f38e36c02f92 Mon Sep 17 00:00:00 2001 From: Jon Lin Date: Fri, 5 Mar 2021 14:33:51 +0800 Subject: [PATCH] drivers: rkflash: Support F59L2G81KA and F59L4G81KA Change-Id: I99cbb82fbad9a678ecd66fc3965e6164ddbd9e7d Signed-off-by: Jon Lin --- drivers/rkflash/flash.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/rkflash/flash.c b/drivers/rkflash/flash.c index 09224d4fd81d..d428f34ac881 100644 --- a/drivers/rkflash/flash.c +++ b/drivers/rkflash/flash.c @@ -446,7 +446,8 @@ u32 nandc_flash_init(void __iomem *nandc_addr) id_byte[0][1] != 0x95 && id_byte[0][1] != 0xDC && id_byte[0][1] != 0xD3 && - id_byte[0][1] != 0x48) + id_byte[0][1] != 0x48 && + id_byte[0][1] != 0x6A) return FTL_UNSUPPORTED_FLASH; } } @@ -462,7 +463,8 @@ u32 nandc_flash_init(void __iomem *nandc_addr) (id_byte[0][0] == 0xC2 && id_byte[0][3] == 0xA2)) { nand_para.plane_per_die = 2; nand_para.sec_per_page = 8; - } else if (id_byte[0][0] == 0x98 && id_byte[0][3] == 0x26) { + } else if ((id_byte[0][0] == 0x98 && id_byte[0][3] == 0x26) || + (id_byte[0][0] == 0xC8 && ((id_byte[0][3] & 0x3) == 1))) { nand_para.blk_per_plane = 1024; nand_para.sec_per_page = 8; nand_para.plane_per_die = 2;