linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: zonque@gmail.com (Daniel Mack)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v8 2/5] mtd: omap-nand: pass device_node in platform data
Date: Fri, 14 Dec 2012 11:36:41 +0100	[thread overview]
Message-ID: <1355481404-27695-3-git-send-email-zonque@gmail.com> (raw)
In-Reply-To: <1355481404-27695-1-git-send-email-zonque@gmail.com>

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>
---
 drivers/mtd/nand/omap2.c                     | 4 +++-
 include/linux/platform_data/mtd-nand-omap2.h | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index 0002d5e..1d333497c 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/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/include/linux/platform_data/mtd-nand-omap2.h b/include/linux/platform_data/mtd-nand-omap2.h
index 24d32ca..6bf9ef4 100644
--- a/include/linux/platform_data/mtd-nand-omap2.h
+++ b/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
-- 
1.7.11.7

  parent reply	other threads:[~2012-12-14 10:36 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-14 10:36 [PATCH v8 0/5] OMAP GPMC DT bindings Daniel Mack
2012-12-14 10:36 ` [PATCH v8 1/5] ARM: OMAP: gpmc: don't create devices from initcall on DT Daniel Mack
2012-12-14 10:36 ` Daniel Mack [this message]
2013-01-15 18:52   ` [PATCH v8 2/5] mtd: omap-nand: pass device_node in platform data Tony Lindgren
2013-01-15 19:09     ` Artem Bityutskiy
2013-01-15 19:26       ` Tony Lindgren
2013-01-15 19:35         ` Artem Bityutskiy
2012-12-14 10:36 ` [PATCH v8 3/5] ARM: OMAP: gpmc-nand: drop __init annotation Daniel Mack
2012-12-14 10:36 ` [PATCH v8 4/5] ARM: OMAP: gpmc: enable hwecc for AM33xx SoCs Daniel Mack
2012-12-14 10:36 ` [PATCH v8 5/5] ARM: OMAP: gpmc: add DT bindings for GPMC timings and NAND Daniel Mack
2012-12-15  7:27   ` Grant Likely
2012-12-24  1:07     ` Daniel Mack
2012-12-23 21:46   ` Ezequiel Garcia
2013-01-14 18:06     ` Tony Lindgren
2013-01-14 23:26       ` Daniel Mack
2013-01-15 18:03         ` Tony Lindgren
2013-01-15 18:10           ` Ezequiel Garcia
2013-01-15 18:56             ` Tony Lindgren
2013-01-18 19:39           ` Ezequiel Garcia
2013-01-18 21:11             ` Tony Lindgren
2013-01-18 22:12               ` Ezequiel Garcia

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1355481404-27695-3-git-send-email-zonque@gmail.com \
    --to=zonque@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).