diff --git a/drivers/mtd/nand/spi/hyf.c b/drivers/mtd/nand/spi/hyf.c index 5c914ad6c34f..dcc828f0827b 100644 --- a/drivers/mtd/nand/spi/hyf.c +++ b/drivers/mtd/nand/spi/hyf.c @@ -139,7 +139,7 @@ static int hyf1gq4udacae_ecc_get_status(struct spinand_device *spinand, static const struct spinand_info hyf_spinand_table[] = { SPINAND_INFO("HYF1GQ4UPACAE", - SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xA1), + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_ADDR, 0xA1), NAND_MEMORG(1, 2048, 128, 64, 1024, 20, 1, 1, 1), NAND_ECCREQ(1, 512), SPINAND_INFO_OP_VARIANTS(&read_cache_variants, @@ -148,7 +148,7 @@ static const struct spinand_info hyf_spinand_table[] = { SPINAND_HAS_QE_BIT, SPINAND_ECCINFO(&hyf1gq4upacae_ooblayout, NULL)), SPINAND_INFO("HYF1GQ4UDACAE", - SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x21), + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_ADDR, 0x21), NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 1), NAND_ECCREQ(4, 512), SPINAND_INFO_OP_VARIANTS(&read_cache_variants, @@ -158,7 +158,7 @@ static const struct spinand_info hyf_spinand_table[] = { SPINAND_ECCINFO(&hyf1gq4udacae_ooblayout, hyf1gq4udacae_ecc_get_status)), SPINAND_INFO("HYF1GQ4UDACAE", - SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x22), + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_ADDR, 0x22), NAND_MEMORG(1, 2048, 64, 64, 2048, 40, 1, 1, 1), NAND_ECCREQ(4, 512), SPINAND_INFO_OP_VARIANTS(&read_cache_variants, @@ -168,7 +168,7 @@ static const struct spinand_info hyf_spinand_table[] = { SPINAND_ECCINFO(&hyf1gq4udacae_ooblayout, hyf1gq4udacae_ecc_get_status)), SPINAND_INFO("HYF2GQ4UAACAE", - SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x52), + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_ADDR, 0x52), NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1), NAND_ECCREQ(14, 512), SPINAND_INFO_OP_VARIANTS(&read_cache_variants, @@ -178,7 +178,7 @@ static const struct spinand_info hyf_spinand_table[] = { SPINAND_ECCINFO(&hyf2gq4uaacae_ooblayout, hyf1gq4udacae_ecc_get_status)), SPINAND_INFO("HYF2GQ4UHCCAE", - SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x5A), + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_ADDR, 0x5A), NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1), NAND_ECCREQ(14, 512), SPINAND_INFO_OP_VARIANTS(&read_cache_variants, @@ -188,7 +188,7 @@ static const struct spinand_info hyf_spinand_table[] = { SPINAND_ECCINFO(&hyf2gq4uaacae_ooblayout, hyf1gq4udacae_ecc_get_status)), SPINAND_INFO("HYF4GQ4UAACBE", - SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xD4), + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_ADDR, 0xD4), NAND_MEMORG(1, 4096, 128, 64, 2048, 40, 1, 1, 1), NAND_ECCREQ(4, 512), SPINAND_INFO_OP_VARIANTS(&read_cache_variants,