mtd: omap-nand: pass device_node in platform data (ccf04c51) · Commits · 戴 / test

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>

drivers/mtd/nand/omap2.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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);

include/linux/platform_data/mtd-nand-omap2.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -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

Admin message