From b910f93894aed0e83c1b326e4eda0c8be95cadf2 Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Fri, 25 Jan 2013 09:23:09 -0300 Subject: [PATCH] --- yaml --- r: 355441 b: refs/heads/master c: dc75eb36c3233409728e88acfd6b45a223856289 h: refs/heads/master i: 355439: 17f02d2beb606d032cb78c74151314bba0451129 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/onenand/omap2.c | 4 +++- trunk/include/linux/platform_data/mtd-onenand-omap2.h | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4963e384ea72..9ca4c1b85505 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6797b4fe0e554ce71f47038fd929c9ca929a9f3c +refs/heads/master: dc75eb36c3233409728e88acfd6b45a223856289 diff --git a/trunk/drivers/mtd/onenand/omap2.c b/trunk/drivers/mtd/onenand/omap2.c index 065f3fe02a2f..eec2aedb4ab8 100644 --- a/trunk/drivers/mtd/onenand/omap2.c +++ b/trunk/drivers/mtd/onenand/omap2.c @@ -637,6 +637,7 @@ static int omap2_onenand_probe(struct platform_device *pdev) struct onenand_chip *this; int r; struct resource *res; + struct mtd_part_parser_data ppdata = {}; pdata = pdev->dev.platform_data; if (pdata == NULL) { @@ -767,7 +768,8 @@ static int omap2_onenand_probe(struct platform_device *pdev) if ((r = onenand_scan(&c->mtd, 1)) < 0) goto err_release_regulator; - r = mtd_device_parse_register(&c->mtd, NULL, NULL, + ppdata.of_node = pdata->of_node; + r = mtd_device_parse_register(&c->mtd, NULL, &ppdata, pdata ? pdata->parts : NULL, pdata ? pdata->nr_parts : 0); if (r) diff --git a/trunk/include/linux/platform_data/mtd-onenand-omap2.h b/trunk/include/linux/platform_data/mtd-onenand-omap2.h index 685af7e8b120..e9a9fb188f97 100644 --- a/trunk/include/linux/platform_data/mtd-onenand-omap2.h +++ b/trunk/include/linux/platform_data/mtd-onenand-omap2.h @@ -29,5 +29,8 @@ struct omap_onenand_platform_data { u8 flags; u8 regulator_can_sleep; u8 skip_initial_unlocking; + + /* for passing the partitions */ + struct device_node *of_node; }; #endif