[PATCH 1/2] mtd: nand: Update driver to match new DT binding

Michal Simek michal.simek at xilinx.com
Wed Feb 23 15:10:33 CET 2022


New binding changed node name from flash at e1000000 to nand-controller at 0,0
which should be reflected in the driver. Both names are supported for
backward compatibility.

Signed-off-by: Michal Simek <michal.simek at xilinx.com>
---

 drivers/mtd/nand/raw/zynq_nand.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/raw/zynq_nand.c b/drivers/mtd/nand/raw/zynq_nand.c
index d79252837065..10e9cd18b077 100644
--- a/drivers/mtd/nand/raw/zynq_nand.c
+++ b/drivers/mtd/nand/raw/zynq_nand.c
@@ -1086,10 +1086,13 @@ static int zynq_nand_probe(struct udevice *dev)
 	int is_16bit_bw;
 
 	smc->reg = (struct zynq_nand_smc_regs *)dev_read_addr(dev);
-	of_nand = dev_read_subnode(dev, "flash at e1000000");
+	of_nand = dev_read_subnode(dev, "nand-controller at 0,0");
 	if (!ofnode_valid(of_nand)) {
-		printf("Failed to find nand node in dt\n");
-		return -ENODEV;
+		of_nand = dev_read_subnode(dev, "flash at e1000000");
+		if (!ofnode_valid(of_nand)) {
+			printf("Failed to find nand node in dt\n");
+			return -ENODEV;
+		}
 	}
 
 	if (!ofnode_is_available(of_nand)) {
-- 
2.35.1



More information about the U-Boot mailing list