ARM: 6904/1: MTD: Add integrator-flash feature to physmap

In the process of moving platforms away from integrator-flash
(aka armflash), add to physmap the few features that make
armflash unique:

- optionnal probing for the AFS partition type
- init() and exit() methods, used by Integrator to control
  write access to the various onboard programmable components

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Acked-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 15 insertions, 1 deletions

diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index 7522df4f71f1..49676b7a53a4 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -67,6 +67,10 @@ static int physmap_flash_remove(struct platform_device *dev)
                 if (info->mtd[i] != NULL)
                         map_destroy(info->mtd[i]);
         }
+
+        if (physmap_data->exit)
+                physmap_data->exit(dev);
+
         return 0;
 }
 
@@ -77,7 +81,11 @@ static const char *rom_probe_types[] = {
                                         "map_rom",
                                         NULL };
 #ifdef CONFIG_MTD_PARTITIONS
-static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL };
+static const char *part_probe_types[] = { "cmdlinepart", "RedBoot",
+#ifdef CONFIG_MTD_AFS_PARTS
+                                          "afs",
+#endif
+                                          NULL };
 #endif
 
 static int physmap_flash_probe(struct platform_device *dev)
@@ -100,6 +108,12 @@ static int physmap_flash_probe(struct platform_device *dev)
                 goto err_out;
         }
 
+        if (physmap_data->init) {
+                err = physmap_data->init(dev);
+                if (err)
+                        goto err_out;
+        }
+
         platform_set_drvdata(dev, info);
 
         for (i = 0; i < dev->num_resources; i++) {