diff options
| author | Wolfgang Grandegger <wg@grandegger.com> | 2009-02-11 18:38:20 +0100 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2009-03-23 15:53:37 -0500 |
| commit | 672ed2aee91b4856f6671fc72cd34168d8f1b624 (patch) | |
| tree | b2eec2d99fbabf1844a8c2a01e93913000f8828c /drivers | |
| parent | 4ace2823bc1fcc96874069a9a8c0821ff4f95f5d (diff) | |
Enable multi chip support in the NAND layer
This patch adds support for NAND_MAX_CHIPS to the MTD NAND layer.
Multi-chips devices are displayed as shown:
Device 0: 2x NAND 512MiB 3,3V 8-bit, sector size 128 KiB
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/nand/nand.c | 6 | ||||
| -rw-r--r-- | drivers/mtd/nand/nand_base.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/mtd/nand/nand.c b/drivers/mtd/nand/nand.c index 70b605f9d..9d8379497 100644 --- a/drivers/mtd/nand/nand.c +++ b/drivers/mtd/nand/nand.c @@ -41,11 +41,15 @@ static const char default_nand_name[] = "nand"; static void nand_init_chip(struct mtd_info *mtd, struct nand_chip *nand, ulong base_addr) { + int maxchips = CONFIG_SYS_NAND_MAX_CHIPS; + + if (maxchips < 1) + maxchips = 1; mtd->priv = nand; nand->IO_ADDR_R = nand->IO_ADDR_W = (void __iomem *)base_addr; if (board_nand_init(nand) == 0) { - if (nand_scan(mtd, 1) == 0) { + if (nand_scan(mtd, maxchips) == 0) { if (!mtd->name) mtd->name = (char *)default_nand_name; else diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index d33fee242..e6ac859e1 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -2652,8 +2652,10 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips) type->id != chip->read_byte(mtd)) break; } +#ifdef DEBUG if (i > 1) printk(KERN_INFO "%d NAND chips detected\n", i); +#endif /* Store the number of chips and calc total size for mtd */ chip->numchips = i; |