Skip to content

Commit

Permalink
mtd: omap-nand: pass device_node in platform data
Browse files Browse the repository at this point in the history
Pass an optional device_node pointer in the platform data, which in turn
will be put into a mtd_part_parser_data. This way, code that sets up the
platform devices can pass along the node from DT so that the partitions
can be parsed.

For non-DT boards, this change has no effect.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Artem Bityutskiy <dedekind1@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
Daniel Mack authored and Tony Lindgren committed Jan 14, 2013
1 parent 2f98ca8 commit ccf04c5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion drivers/mtd/nand/omap2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 3 additions & 1 deletion include/linux/platform_data/mtd-nand-omap2.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit ccf04c5

Please sign in to comment.