mtd: nand: Update driver to match new DT binding
authorMichal Simek <michal.simek@xilinx.com>
Wed, 23 Feb 2022 14:10:33 +0000 (15:10 +0100)
committerMichal Simek <michal.simek@xilinx.com>
Mon, 7 Mar 2022 07:52:20 +0000 (08:52 +0100)
New binding changed node name from flash@e1000000 to nand-controller@0,0
which should be reflected in the driver. Both names are supported for
backward compatibility.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Link: https://lore.kernel.org/r/61f6edd965e0c0b179184823d5283c6c61a1eb35.1645625433.git.michal.simek@xilinx.com
drivers/mtd/nand/raw/zynq_nand.c

index d792528..10e9cd1 100644 (file)
@@ -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@e1000000");
+       of_nand = dev_read_subnode(dev, "nand-controller@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@e1000000");
+               if (!ofnode_valid(of_nand)) {
+                       printf("Failed to find nand node in dt\n");
+                       return -ENODEV;
+               }
        }
 
        if (!ofnode_is_available(of_nand)) {