Merge tag 'acpi-6.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[platform/kernel/linux-rpi.git] / drivers / mtd / maps / physmap-core.c

diff --git a/drivers/mtd/maps/physmap-core.c b/drivers/mtd/maps/physmap-core.c
index 78710fb..fc87213 100644 (file)
--- a/drivers/mtd/maps/physmap-core.c
+++ b/drivers/mtd/maps/physmap-core.c
@@ -551,6 +551,17 @@ static int physmap_flash_probe(struct platform_device *dev)
                if (info->probe_type) {
                        info->mtds[i] = do_map_probe(info->probe_type,
                                                     &info->maps[i]);
+
+                       /* Fall back to mapping region as ROM */
+                       if (!info->mtds[i] && IS_ENABLED(CONFIG_MTD_ROM) &&
+                           strcmp(info->probe_type, "map_rom")) {
+                               dev_warn(&dev->dev,
+                                        "map_probe() failed for type %s\n",
+                                        info->probe_type);
+
+                               info->mtds[i] = do_map_probe("map_rom",
+                                                            &info->maps[i]);
+                       }
                } else {
                        int j;