mtd: partitions: redboot: seek fis-index-block in the right node
authorCorentin Labbe <clabbe@baylibre.com>
Thu, 20 May 2021 11:48:50 +0000 (11:48 +0000)
committerMiquel Raynal <miquel.raynal@bootlin.com>
Wed, 26 May 2021 08:58:28 +0000 (10:58 +0200)
fis-index-block is seeked in the master node and not in the partitions node.
For following binding and current usage, the driver need to check the
partitions subnode.

Fixes: c0e118c8a1a3 ("mtd: partitions: Add OF support to RedBoot partitions")
Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20210520114851.1274609-1-clabbe@baylibre.com
drivers/mtd/parsers/redboot.c

index 91146bdc4713214267458144b3a433d5e0c301f8..3ccd6363ee8cba9cd99f2581a4064d0a50ea1006 100644 (file)
@@ -45,6 +45,7 @@ static inline int redboot_checksum(struct fis_image_desc *img)
 static void parse_redboot_of(struct mtd_info *master)
 {
        struct device_node *np;
+       struct device_node *npart;
        u32 dirblock;
        int ret;
 
@@ -52,7 +53,11 @@ static void parse_redboot_of(struct mtd_info *master)
        if (!np)
                return;
 
-       ret = of_property_read_u32(np, "fis-index-block", &dirblock);
+       npart = of_get_child_by_name(np, "partitions");
+       if (!npart)
+               return;
+
+       ret = of_property_read_u32(npart, "fis-index-block", &dirblock);
        if (ret)
                return;