Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.git] / drivers / mtd / maps / physmap_of.c

diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index 3fad35942895c0186dfa08d22ab655fc0a4ed37f..14e8909c99555bb89a84f5c7671b3985b315c883 100644 (file)
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -24,6 +24,7 @@
 #include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <linux/slab.h>
+#include "physmap_of_gemini.h"
 #include "physmap_of_versatile.h"
 
 struct of_flash_list {
@@ -241,11 +242,13 @@ static int of_flash_probe(struct platform_device *dev)
                info->list[i].map.size = res_size;
                info->list[i].map.bankwidth = be32_to_cpup(width);
                info->list[i].map.device_node = dp;
+
+               err = of_flash_probe_gemini(dev, dp, &info->list[i].map);
+               if (err)
+                       return err;
                err = of_flash_probe_versatile(dev, dp, &info->list[i].map);
-               if (err) {
-                       dev_err(&dev->dev, "Can't probe Versatile VPP\n");
+               if (err)
                        return err;
-               }
 
                err = -ENOMEM;
                info->list[i].map.virt = ioremap(info->list[i].map.phys,