1 files changed, 21 insertions, 7 deletions

diff --git a/drivers/mtd/nand/plat_nand.c b/drivers/mtd/nand/plat_nand.c
index 6404e6e81b10..1bcb52040422 100644
--- a/drivers/mtd/nand/plat_nand.c
+++ b/drivers/mtd/nand/plat_nand.c
@@ -23,14 +23,18 @@ struct plat_nand_data {
         void __iomem            *io_base;
 };
 
+static const char *part_probe_types[] = { "cmdlinepart", NULL };
+
 /*
  * Probe for the NAND device.
  */
 static int __devinit plat_nand_probe(struct platform_device *pdev)
 {
         struct platform_nand_data *pdata = pdev->dev.platform_data;
+        struct mtd_part_parser_data ppdata;
         struct plat_nand_data *data;
         struct resource *res;
+        const char **part_types;
         int err = 0;
 
         if (pdata->chip.nr_chips < 1) {
@@ -75,6 +79,7 @@ static int __devinit plat_nand_probe(struct platform_device *pdev)
         data->chip.select_chip = pdata->ctrl.select_chip;
         data->chip.write_buf = pdata->ctrl.write_buf;
         data->chip.read_buf = pdata->ctrl.read_buf;
+        data->chip.read_byte = pdata->ctrl.read_byte;
         data->chip.chip_delay = pdata->chip.chip_delay;
         data->chip.options |= pdata->chip.options;
         data->chip.bbt_options |= pdata->chip.bbt_options;
@@ -98,8 +103,10 @@ static int __devinit plat_nand_probe(struct platform_device *pdev)
                 goto out;
         }
 
-        err = mtd_device_parse_register(&data->mtd,
-                                        pdata->chip.part_probe_types, NULL,
+        part_types = pdata->chip.part_probe_types ? : part_probe_types;
+
+        ppdata.of_node = pdev->dev.of_node;
+        err = mtd_device_parse_register(&data->mtd, part_types, &ppdata,
                                         pdata->chip.partitions,
                                         pdata->chip.nr_partitions);
 
@@ -140,12 +147,19 @@ static int __devexit plat_nand_remove(struct platform_device *pdev)
         return 0;
 }
 
+static const struct of_device_id plat_nand_match[] = {
+        { .compatible = "gen_nand" },
+        {},
+};
+MODULE_DEVICE_TABLE(of, plat_nand_match);
+
 static struct platform_driver plat_nand_driver = {
-        .probe          = plat_nand_probe,
-        .remove         = __devexit_p(plat_nand_remove),
-        .driver         = {
-                .name   = "gen_nand",
-                .owner  = THIS_MODULE,
+        .probe  = plat_nand_probe,
+        .remove = __devexit_p(plat_nand_remove),
+        .driver = {
+                .name           = "gen_nand",
+                .owner          = THIS_MODULE,
+                .of_match_table = plat_nand_match,
         },
 };