From a2875f15a8784a1811f5220796e6767d9533bf62 Mon Sep 17 00:00:00 2001 From: Jason Zhu Date: Mon, 11 Jan 2021 11:12:58 +0800 Subject: [PATCH] dm: blk: fix spi flash uclass different error when use mtd block Add more condition to decide which dev is "mtd 2". More info seen in 82ee4254158e33c79021caade5639182d8116b64. Signed-off-by: Jason Zhu Change-Id: Iea84b5a7307969dad785f3136b0af8b9f45e94f6 --- drivers/block/blk-uclass.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c index 0d3574ffb7..0746f6dabd 100644 --- a/drivers/block/blk-uclass.c +++ b/drivers/block/blk-uclass.c @@ -135,8 +135,9 @@ struct blk_desc *blk_get_devnum_by_typename(const char *if_typename, int devnum) * the UCLASS_MTD when find the mtd block device. * Fix it here when enable CONFIG_MTD_BLK. */ - if ((if_type == IF_TYPE_MTD) && - (devnum == BLK_MTD_SPI_NOR)) { + if (device_get_uclass_id(dev->parent) == UCLASS_SPI_FLASH && + if_type == IF_TYPE_MTD && + devnum == BLK_MTD_SPI_NOR) { debug("Fix the spi flash uclass different\n"); } else { debug("%s: parent uclass %d, this dev %d\n",