From 67ed933553de1dcb711d201984ffb2640a1ad8ab Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Fri, 14 Dec 2012 11:36:41 +0100 Subject: [PATCH] --- yaml --- r: 355435 b: refs/heads/master c: ccf04c51004d0b973a688a91c879e2d91780d03c h: refs/heads/master i: 355433: bcce2b3d430211eb111ec6550033d2558415aab8 355431: 291f0cd0c833c83cab127e5c649db6da0b9cb05f v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/omap2.c | 4 +++- trunk/include/linux/platform_data/mtd-nand-omap2.h | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b3194d81eefd..e30a52e5fc66 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f98ca895198c1c6f5c9f418e1bbf84660d9ba4f +refs/heads/master: ccf04c51004d0b973a688a91c879e2d91780d03c diff --git a/trunk/drivers/mtd/nand/omap2.c b/trunk/drivers/mtd/nand/omap2.c index 0002d5e94f0d..1d333497cfcb 100644 --- a/trunk/drivers/mtd/nand/omap2.c +++ b/trunk/drivers/mtd/nand/omap2.c @@ -1332,6 +1332,7 @@ static int omap_nand_probe(struct platform_device *pdev) dma_cap_mask_t mask; unsigned sig; struct resource *res; + struct mtd_part_parser_data ppdata = {}; pdata = pdev->dev.platform_data; if (pdata == NULL) { @@ -1557,7 +1558,8 @@ static int omap_nand_probe(struct platform_device *pdev) goto out_release_mem_region; } - mtd_device_parse_register(&info->mtd, NULL, NULL, pdata->parts, + ppdata.of_node = pdata->of_node; + mtd_device_parse_register(&info->mtd, NULL, &ppdata, pdata->parts, pdata->nr_parts); platform_set_drvdata(pdev, &info->mtd); diff --git a/trunk/include/linux/platform_data/mtd-nand-omap2.h b/trunk/include/linux/platform_data/mtd-nand-omap2.h index 24d32ca34bef..6bf9ef43ddb1 100644 --- a/trunk/include/linux/platform_data/mtd-nand-omap2.h +++ b/trunk/include/linux/platform_data/mtd-nand-omap2.h @@ -60,6 +60,8 @@ struct omap_nand_platform_data { int devsize; enum omap_ecc ecc_opt; struct gpmc_nand_regs reg; -}; + /* for passing the partitions */ + struct device_node *of_node; +}; #endif