1 files changed, 32 insertions, 44 deletions

diff --git a/drivers/mtd/maps/lantiq-flash.c b/drivers/mtd/maps/lantiq-flash.c
index b5401e355745..c03456f17004 100644
--- a/drivers/mtd/maps/lantiq-flash.c
+++ b/drivers/mtd/maps/lantiq-flash.c
@@ -19,9 +19,9 @@
 #include <linux/mtd/cfi.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/physmap.h>
+#include <linux/of.h>
 
 #include <lantiq_soc.h>
-#include <lantiq_platform.h>
 
 /*
  * The NOR flash is connected to the same external bus unit (EBU) as PCI.
@@ -44,8 +44,9 @@ struct ltq_mtd {
         struct map_info *map;
 };
 
-static char ltq_map_name[] = "ltq_nor";
-static const char *ltq_probe_types[] __devinitconst = { "cmdlinepart", NULL };
+static const char ltq_map_name[] = "ltq_nor";
+static const char *ltq_probe_types[] __devinitconst = {
+                                        "cmdlinepart", "ofpart", NULL };
 
 static map_word
 ltq_read16(struct map_info *map, unsigned long adr)
@@ -108,42 +109,38 @@ ltq_copy_to(struct map_info *map, unsigned long to,
         spin_unlock_irqrestore(&ebu_lock, flags);
 }
 
-static int __init
+static int __devinit
 ltq_mtd_probe(struct platform_device *pdev)
 {
-        struct physmap_flash_data *ltq_mtd_data = dev_get_platdata(&pdev->dev);
+        struct mtd_part_parser_data ppdata;
         struct ltq_mtd *ltq_mtd;
-        struct resource *res;
         struct cfi_private *cfi;
         int err;
 
+        if (of_machine_is_compatible("lantiq,falcon") &&
+                        (ltq_boot_select() != BS_FLASH)) {
+                dev_err(&pdev->dev, "invalid bootstrap options\n");
+                return -ENODEV;
+        }
+
         ltq_mtd = kzalloc(sizeof(struct ltq_mtd), GFP_KERNEL);
         platform_set_drvdata(pdev, ltq_mtd);
 
         ltq_mtd->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!ltq_mtd->res) {
-                dev_err(&pdev->dev, "failed to get memory resource");
+                dev_err(&pdev->dev, "failed to get memory resource\n");
                 err = -ENOENT;
                 goto err_out;
         }
 
-        res = devm_request_mem_region(&pdev->dev, ltq_mtd->res->start,
-                resource_size(ltq_mtd->res), dev_name(&pdev->dev));
-        if (!ltq_mtd->res) {
-                dev_err(&pdev->dev, "failed to request mem resource");
-                err = -EBUSY;
-                goto err_out;
-        }
-
         ltq_mtd->map = kzalloc(sizeof(struct map_info), GFP_KERNEL);
-        ltq_mtd->map->phys = res->start;
-        ltq_mtd->map->size = resource_size(res);
-        ltq_mtd->map->virt = devm_ioremap_nocache(&pdev->dev,
-                                ltq_mtd->map->phys, ltq_mtd->map->size);
+        ltq_mtd->map->phys = ltq_mtd->res->start;
+        ltq_mtd->map->size = resource_size(ltq_mtd->res);
+        ltq_mtd->map->virt = devm_request_and_ioremap(&pdev->dev, ltq_mtd->res);
         if (!ltq_mtd->map->virt) {
-                dev_err(&pdev->dev, "failed to ioremap!\n");
-                err = -ENOMEM;
-                goto err_free;
+                dev_err(&pdev->dev, "failed to remap mem resource\n");
+                err = -EBUSY;
+                goto err_out;
         }
 
         ltq_mtd->map->name = ltq_map_name;
@@ -169,9 +166,9 @@ ltq_mtd_probe(struct platform_device *pdev)
         cfi->addr_unlock1 ^= 1;
         cfi->addr_unlock2 ^= 1;
 
-        err = mtd_device_parse_register(ltq_mtd->mtd, ltq_probe_types, NULL,
-                                        ltq_mtd_data->parts,
-                                        ltq_mtd_data->nr_parts);
+        ppdata.of_node = pdev->dev.of_node;
+        err = mtd_device_parse_register(ltq_mtd->mtd, ltq_probe_types,
+                                        &ppdata, NULL, 0);
         if (err) {
                 dev_err(&pdev->dev, "failed to add partitions\n");
                 goto err_destroy;
@@ -204,32 +201,23 @@ ltq_mtd_remove(struct platform_device *pdev)
         return 0;
 }
 
+static const struct of_device_id ltq_mtd_match[] = {
+        { .compatible = "lantiq,nor" },
+        {},
+};
+MODULE_DEVICE_TABLE(of, ltq_mtd_match);
+
 static struct platform_driver ltq_mtd_driver = {
+        .probe = ltq_mtd_probe,
         .remove = __devexit_p(ltq_mtd_remove),
         .driver = {
-                .name = "ltq_nor",
+                .name = "ltq-nor",
                 .owner = THIS_MODULE,
+                .of_match_table = ltq_mtd_match,
         },
 };
 
-static int __init
-init_ltq_mtd(void)
-{
-        int ret = platform_driver_probe(&ltq_mtd_driver, ltq_mtd_probe);
-
-        if (ret)
-                pr_err("ltq_nor: error registering platform driver");
-        return ret;
-}
-
-static void __exit
-exit_ltq_mtd(void)
-{
-        platform_driver_unregister(&ltq_mtd_driver);
-}
-
-module_init(init_ltq_mtd);
-module_exit(exit_ltq_mtd);
+module_platform_driver(ltq_mtd_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("John Crispin <blogic@openwrt.org>");