From 5ce680f3fbfa6a8313e6a205b2a91483e34d0d65 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 31 May 2010 08:49:40 +0300 Subject: [PATCH] --- yaml --- r: 201568 b: refs/heads/master c: cce02464dd4733e8173d01a9a7a3ff5491c8546b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-mxc/include/mach/mxc_nand.h | 4 ++++ trunk/drivers/mtd/nand/mxc_nand.c | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index aa6b1b4da275..3e9de4193311 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ea32021c173c0c97482a1342a9069733032b647 +refs/heads/master: cce02464dd4733e8173d01a9a7a3ff5491c8546b diff --git a/trunk/arch/arm/plat-mxc/include/mach/mxc_nand.h b/trunk/arch/arm/plat-mxc/include/mach/mxc_nand.h index 5d2d21d414e0..2d74748c5db7 100644 --- a/trunk/arch/arm/plat-mxc/include/mach/mxc_nand.h +++ b/trunk/arch/arm/plat-mxc/include/mach/mxc_nand.h @@ -20,9 +20,13 @@ #ifndef __ASM_ARCH_NAND_H #define __ASM_ARCH_NAND_H +#include + 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/trunk/drivers/mtd/nand/mxc_nand.c b/trunk/drivers/mtd/nand/mxc_nand.c index 6e8aa34e4dfc..0d76b169482f 100644 --- a/trunk/drivers/mtd/nand/mxc_nand.c +++ b/trunk/drivers/mtd/nand/mxc_nand.c @@ -832,6 +832,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 {