Patchwork [PATCHv2] mxc_nand: add support for platform defined partitions

login
register
mail settings
Submitter Baruch Siach
Date May 31, 2010, 5:49 a.m.
Message ID <db7fb65b330824c5647ea4271a5f5aa30da6612b.1275284592.git.baruch@tkos.co.il>
Download mbox | patch
Permalink /patch/54068/
State Accepted
Commit cce02464dd4733e8173d01a9a7a3ff5491c8546b
Headers show

Comments

Baruch Siach - May 31, 2010, 5:49 a.m.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
Changes v1 -> v2

	Changed the indentation of new fields in mxc_nand_platform_data as 
	suggested by Marc Kleine-Budde

 arch/arm/plat-mxc/include/mach/mxc_nand.h |    4 ++++
 drivers/mtd/nand/mxc_nand.c               |    2 ++
 2 files changed, 6 insertions(+), 0 deletions(-)

Patch

diff --git a/arch/arm/plat-mxc/include/mach/mxc_nand.h b/arch/arm/plat-mxc/include/mach/mxc_nand.h
index 5d2d21d..2d74748 100644
--- a/arch/arm/plat-mxc/include/mach/mxc_nand.h
+++ b/arch/arm/plat-mxc/include/mach/mxc_nand.h
@@ -20,9 +20,13 @@ 
 #ifndef __ASM_ARCH_NAND_H
 #define __ASM_ARCH_NAND_H
 
+#include <linux/mtd/partitions.h>
+
 struct mxc_nand_platform_data {
 	int width;	/* data bus width in bytes */
 	int hw_ecc:1;	/* 0 if supress hardware ECC */
 	int flash_bbt:1; /* set to 1 to use a flash based bbt */
+	struct mtd_partition *parts;	/* partition table */
+	int nr_parts;			/* size of parts */
 };
 #endif /* __ASM_ARCH_NAND_H */
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 82e9438..8bfe158 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -853,6 +853,8 @@  static int __init mxcnd_probe(struct platform_device *pdev)
 	    parse_mtd_partitions(mtd, part_probes, &host->parts, 0);
 	if (nr_parts > 0)
 		add_mtd_partitions(mtd, host->parts, nr_parts);
+	else if (pdata->parts)
+		add_mtd_partitions(mtd, pdata->parts, pdata->nr_parts);
 	else
 #endif
 	{