From: Michal Simek <michal.simek@xilinx.com>
Date: Tue, 25 Feb 2020 13:40:42 +0000 (+0100)
Subject: nand: raw: zynq: Do not try to probe driver if nand flash is disabled
X-Git-Tag: v2020.07-rc1~41^2~4^2~24
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3811746ed9b48c8a538fc6a6edfe91aaf9acb76a;p=oweals%2Fu-boot.git

nand: raw: zynq: Do not try to probe driver if nand flash is disabled

There is no reason to continue when DT status property indicates that NAND
flash is disabled. But that means that NOR flash should be present that's
why try it find it out.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
---

diff --git a/drivers/mtd/nand/raw/zynq_nand.c b/drivers/mtd/nand/raw/zynq_nand.c
index 7039149692..0aea83dac0 100644
--- a/drivers/mtd/nand/raw/zynq_nand.c
+++ b/drivers/mtd/nand/raw/zynq_nand.c
@@ -1090,6 +1090,11 @@ static int zynq_nand_probe(struct udevice *dev)
 		return -ENODEV;
 	}
 
+	if (!ofnode_is_available(of_nand)) {
+		debug("Nand node in dt disabled\n");
+		return dm_scan_fdt_dev(dev);
+	}
+
 	if (ofnode_read_resource(of_nand, 0, &res)) {
 		printf("Failed to get nand resource\n");
 		return -ENODEV;