From 804ae30f4b6f9cc7206571dd638d0e233f0930a8 Mon Sep 17 00:00:00 2001 From: "Mark A. Greer" Date: Mon, 12 Oct 2009 16:16:37 -0700 Subject: [PATCH] --- yaml --- r: 176959 b: refs/heads/master c: f611a79fe9859a30f2a7ae94b4d24f8e2dd75c91 h: refs/heads/master i: 176957: b757ef50727bfb28f4dd412b3ed810b414544ed4 176955: 185db8274b97ac5403b40ec96ab49a48325ed2d7 176951: 71d385f99450934175bc5675b6ed076fb94a83c2 176943: 8c068bf6296c7f2f074faf0ef095a0dfd16a61ee 176927: f10b7e68d07df21204cf92fc7b9eef22b59bbed7 176895: 55d9bbb21ccc7db342fc0d471cbc209207b5b3d8 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-davinci/include/mach/nand.h | 4 ++++ trunk/drivers/mtd/nand/davinci_nand.c | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 05d9d63316ff..af8918a8ad10 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 837479d25e221ba616de2c734f58e1decd8cdb95 +refs/heads/master: f611a79fe9859a30f2a7ae94b4d24f8e2dd75c91 diff --git a/trunk/arch/arm/mach-davinci/include/mach/nand.h b/trunk/arch/arm/mach-davinci/include/mach/nand.h index b520c4b5678a..b2ad8090bd10 100644 --- a/trunk/arch/arm/mach-davinci/include/mach/nand.h +++ b/trunk/arch/arm/mach-davinci/include/mach/nand.h @@ -79,6 +79,10 @@ struct davinci_nand_pdata { /* platform_data */ /* e.g. NAND_BUSWIDTH_16 or NAND_USE_FLASH_BBT */ unsigned options; + + /* Main and mirror bbt descriptor overrides */ + struct nand_bbt_descr *bbt_td; + struct nand_bbt_descr *bbt_md; }; #endif /* __ARCH_ARM_DAVINCI_NAND_H */ diff --git a/trunk/drivers/mtd/nand/davinci_nand.c b/trunk/drivers/mtd/nand/davinci_nand.c index 68cc9247fdb0..fe3eba87de40 100644 --- a/trunk/drivers/mtd/nand/davinci_nand.c +++ b/trunk/drivers/mtd/nand/davinci_nand.c @@ -591,6 +591,8 @@ static int __init nand_davinci_probe(struct platform_device *pdev) /* options such as NAND_USE_FLASH_BBT or 16-bit widths */ info->chip.options = pdata->options; + info->chip.bbt_td = pdata->bbt_td; + info->chip.bbt_md = pdata->bbt_md; info->ioaddr = (uint32_t __force) vaddr;