From: Daniel Mack <zonque@gmail.com>
To: linux-arm-kernel@lists.infradead.org, grant.likely@secretlab.ca,
rob.herring@calxeda.com
Cc: linux-omap@vger.kernel.org, jon-hunter@ti.com,
avinashphilip@ti.com, x0148406@ti.com, tony@atomide.com,
paul@pwsan.com, nsekhar@ti.com, jacmet@sunsite.dk,
devicetree-discuss@lists.ozlabs.org,
Daniel Mack <zonque@gmail.com>
Subject: [PATCH v7 2/5] mtd: omap-nand: pass device_node in platform data
Date: Wed, 5 Dec 2012 20:09:28 +0100 [thread overview]
Message-ID: <1354734571-10774-3-git-send-email-zonque@gmail.com> (raw)
In-Reply-To: <1354734571-10774-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
WARNING: multiple messages have this Message-ID (diff)
From: zonque@gmail.com (Daniel Mack)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v7 2/5] mtd: omap-nand: pass device_node in platform data
Date: Wed, 5 Dec 2012 20:09:28 +0100 [thread overview]
Message-ID: <1354734571-10774-3-git-send-email-zonque@gmail.com> (raw)
In-Reply-To: <1354734571-10774-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
next prev parent reply other threads:[~2012-12-05 19:09 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-05 19:09 [PATCH v7 0/5] OMAP GPMC DT bindings Daniel Mack
2012-12-05 19:09 ` Daniel Mack
2012-12-05 19:09 ` [PATCH v7 1/5] ARM: OMAP: gpmc: don't create devices from initcall on DT Daniel Mack
2012-12-05 19:09 ` Daniel Mack
2012-12-05 19:09 ` Daniel Mack [this message]
2012-12-05 19:09 ` [PATCH v7 2/5] mtd: omap-nand: pass device_node in platform data Daniel Mack
2012-12-05 19:09 ` [PATCH v7 3/5] ARM: OMAP: gpmc-nand: drop __init annotation Daniel Mack
2012-12-05 19:09 ` Daniel Mack
2012-12-05 19:09 ` [PATCH v7 4/5] ARM: OMAP: gpmc: enable hwecc for AM33xx SoCs Daniel Mack
2012-12-05 19:09 ` Daniel Mack
2012-12-05 19:09 ` [PATCH v7 5/5] ARM: OMAP: gpmc: add DT bindings for GPMC timings and NAND Daniel Mack
2012-12-05 19:09 ` Daniel Mack
2012-12-05 22:22 ` Grant Likely
2012-12-05 22:22 ` Grant Likely
2012-12-05 22:33 ` Jon Hunter
2012-12-05 22:33 ` Jon Hunter
2012-12-05 23:24 ` Grant Likely
2012-12-05 23:24 ` Grant Likely
2012-12-06 0:03 ` Tony Lindgren
2012-12-06 0:03 ` Tony Lindgren
[not found] ` <20121206000302.GM21682-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2012-12-06 16:22 ` Jon Hunter
2012-12-06 16:22 ` Jon Hunter
[not found] ` <50C0C646.9000802-l0cyMroinI0@public.gmane.org>
2012-12-06 16:54 ` Daniel Mack
2012-12-06 16:54 ` Daniel Mack
[not found] ` <50C0CDB0.5050008-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2012-12-06 18:11 ` Jon Hunter
2012-12-06 18:11 ` Jon Hunter
2012-12-06 16:19 ` Jon Hunter
2012-12-06 16:19 ` Jon Hunter
[not found] ` <50C0C5AB.3030201-l0cyMroinI0@public.gmane.org>
2012-12-06 16:59 ` Daniel Mack
2012-12-06 16:59 ` Daniel Mack
2012-12-12 9:13 ` Daniel Mack
2012-12-12 9:13 ` Daniel Mack
[not found] ` <50C84AC6.5030307-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2012-12-12 23:02 ` Jon Hunter
2012-12-12 23:02 ` Jon Hunter
2012-12-15 0:37 ` Grant Likely
2012-12-15 0:37 ` Grant Likely
[not found] ` <1354734571-10774-1-git-send-email-zonque-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2012-12-05 19:22 ` [PATCH v7 0/5] OMAP GPMC DT bindings Jon Hunter
2012-12-05 19:22 ` Jon Hunter
2012-12-05 19:24 ` Daniel Mack
2012-12-05 19:24 ` Daniel Mack
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=1354734571-10774-3-git-send-email-zonque@gmail.com \
--to=zonque@gmail.com \
--cc=avinashphilip@ti.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=grant.likely@secretlab.ca \
--cc=jacmet@sunsite.dk \
--cc=jon-hunter@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=nsekhar@ti.com \
--cc=paul@pwsan.com \
--cc=rob.herring@calxeda.com \
--cc=tony@atomide.com \
--cc=x0148406@ti.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.