Skip to content

Commit

Permalink
OF: MTD: make plat_nand loadable from DT
Browse files Browse the repository at this point in the history
This patch sets the of_match_table field inside plat_nand's platform_driver.
We also add a struct mtd_part_parser_data pointer to make sure of_part parsing
works.

If an arch wants to support plat_nand via DT it needs to setup the
platform_nand_data and hook it into the platform_device.

Signed-off-by: John Crispin <blogic@openwrt.org>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
  • Loading branch information
John Crispin authored and David Woodhouse committed May 14, 2012
1 parent bb08bc1 commit a4f2035
Showing 1 changed file with 15 additions and 6 deletions.
21 changes: 15 additions & 6 deletions drivers/mtd/nand/plat_nand.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ static const char *part_probe_types[] = { "cmdlinepart", NULL };
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;
Expand Down Expand Up @@ -103,7 +104,8 @@ static int __devinit plat_nand_probe(struct platform_device *pdev)

part_types = pdata->chip.part_probe_types ? : part_probe_types;

err = mtd_device_parse_register(&data->mtd, part_types, NULL,
ppdata.of_node = pdev->dev.of_node;
err = mtd_device_parse_register(&data->mtd, part_types, &ppdata,
pdata->chip.partitions,
pdata->chip.nr_partitions);

Expand Down Expand Up @@ -144,12 +146,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,
},
};

Expand Down

0 comments on commit a4f2035

Please sign in to comment.