Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Add hook to NAND erase and implement nand_wait function.

Browse source 
Patch by Mike Rapoport, 01 Nov 2005

  Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
This commit is contained in:
Wolfgang Denk 2005-11-02 14:29:12 +01:00
parent ac7eb8a315
commit 8e9655f863
3 changed files with 42 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/Makefile
View file

@ -37,7 +37,7 @@ COBJS = main.o ACEX1K.o altera.o bedbug.o circbuf.o \
cmd_i2c.o cmd_ide.o cmd_immap.o cmd_itest.o cmd_jffs2.o \
cmd_load.o cmd_log.o \
cmd_mem.o cmd_mii.o cmd_misc.o cmd_mmc.o \
cmd_nand.o cmd_net.o cmd_nvedit.o \
cmd_nand.o cmd_nand_new.o cmd_net.o cmd_nvedit.o \
cmd_pci.o cmd_pcmcia.o cmd_portio.o \
cmd_reginfo.o cmd_reiser.o cmd_scsi.o cmd_spi.o cmd_universe.o cmd_usb.o cmd_vfd.o \
command.o console.o devices.o dlmalloc.o docecc.o \

36
drivers/nand/nand_base.c
View file

@ -189,7 +189,11 @@ static void nand_release_device (struct mtd_info *mtd)
spin_unlock (&this->chip_lock);
}
#else
#define nand_release_device(mtd) do {} while(0)
static void nand_release_device (struct mtd_info *mtd)
{
struct nand_chip *this = mtd->priv;
this->select_chip(mtd, -1); /* De-select the NAND device */
}
#endif
/**
@ -831,8 +835,34 @@ static int nand_wait(struct mtd_info *mtd, struct nand_chip *this, int state)
#else
static int nand_wait(struct mtd_info *mtd, struct nand_chip *this, int state)
{
/* TODO */
return 0;
unsigned long timeo;
if (state == FL_ERASING)
timeo = CFG_HZ * 400;
else
timeo = CFG_HZ * 20;
if ((state == FL_ERASING) && (this->options & NAND_IS_AND))
this->cmdfunc(mtd, NAND_CMD_STATUS_MULTI, -1, -1);
else
this->cmdfunc(mtd, NAND_CMD_STATUS, -1, -1);
reset_timer_masked();
while (1) {
if (get_timer_masked() > timeo)
return 0;
if (this->dev_ready) {
if (this->dev_ready(mtd))
break;
} else {
if (this->read_byte(mtd) & NAND_STATUS_READY)
break;
}
}
return this->read_byte(mtd);
}
#endif

9
include/nand.h
View file

@ -50,7 +50,14 @@ static inline int nand_block_isbad(nand_info_t *info, ulong ofs)
static inline int nand_erase(nand_info_t *info, ulong off, ulong size)
{
return 0; /* FIXME */
struct erase_info instr;
instr.mtd = info;
instr.addr = off;
instr.len = size;
instr.callback = 0;
return info->erase(info, &instr);
}
#endif