V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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>
This commit is contained in:
Wolfgang Grandegger 2009-02-11 18:38:20 +01:00 committed by Scott Wood
parent 4ace2823bc
commit 672ed2aee9
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common/cmd_nand.c
View File

@ -205,6 +205,17 @@ static void do_nand_status(nand_info_t *nand)
} }
#endif #endif
static void nand_print_info(int idx)
{
nand_info_t *nand = &nand_info[idx];
struct nand_chip *chip = nand->priv;
printf("Device %d: ", idx);
if (chip->numchips > 1)
printf("%dx ", chip->numchips);
printf("%s, sector size %u KiB\n",
nand->name, nand->erasesize >> 10);
}
int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
{ {
int i, dev, ret = 0; int i, dev, ret = 0;
@ -233,9 +244,7 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
putc('\n'); putc('\n');
for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++) { for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++) {
if (nand_info[i].name) if (nand_info[i].name)
printf("Device %d: %s, sector size %u KiB\n", nand_print_info(i);
i, nand_info[i].name,
nand_info[i].erasesize >> 10);
} }
return 0; return 0;
} }
@ -243,12 +252,12 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
if (strcmp(cmd, "device") == 0) { if (strcmp(cmd, "device") == 0) {
if (argc < 3) { if (argc < 3) {
putc('\n');
if ((nand_curr_device < 0) || if ((nand_curr_device < 0) ||
(nand_curr_device >= CONFIG_SYS_MAX_NAND_DEVICE)) (nand_curr_device >= CONFIG_SYS_MAX_NAND_DEVICE))
puts("\nno devices available\n"); puts("no devices available\n");
else else
printf("\nDevice %d: %s\n", nand_curr_device, nand_print_info(nand_curr_device);
nand_info[nand_curr_device].name);
return 0; return 0;
} }
dev = (int)simple_strtoul(argv[2], NULL, 10); dev = (int)simple_strtoul(argv[2], NULL, 10);

6
drivers/mtd/nand/nand.c
View File

@ -41,11 +41,15 @@ static const char default_nand_name[] = "nand";
static void nand_init_chip(struct mtd_info *mtd, struct nand_chip *nand, static void nand_init_chip(struct mtd_info *mtd, struct nand_chip *nand,
ulong base_addr) ulong base_addr)
{ {
int maxchips = CONFIG_SYS_NAND_MAX_CHIPS;
if (maxchips < 1)
maxchips = 1;
mtd->priv = nand; mtd->priv = nand;
nand->IO_ADDR_R = nand->IO_ADDR_W = (void __iomem *)base_addr; nand->IO_ADDR_R = nand->IO_ADDR_W = (void __iomem *)base_addr;
if (board_nand_init(nand) == 0) { if (board_nand_init(nand) == 0) {
if (nand_scan(mtd, 1) == 0) { if (nand_scan(mtd, maxchips) == 0) {
if (!mtd->name) if (!mtd->name)
mtd->name = (char *)default_nand_name; mtd->name = (char *)default_nand_name;
else else

2
drivers/mtd/nand/nand_base.c
View File

@ -2652,8 +2652,10 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips)
type->id != chip->read_byte(mtd)) type->id != chip->read_byte(mtd))
break; break;
} }
#ifdef DEBUG
if (i > 1) if (i > 1)
printk(KERN_INFO "%d NAND chips detected\n", i); printk(KERN_INFO "%d NAND chips detected\n", i);
#endif
/* Store the number of chips and calc total size for mtd */ /* Store the number of chips and calc total size for mtd */
chip->numchips = i; chip->numchips = i;