diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-07 22:22:05 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-07 22:22:05 +0200 |
| commit | a48ecc969f8d2d0fe9167962e9b8b4cca52de10b (patch) | |
| tree | 604e04770713cb314cb6184e26eeb4319dec3d43 /drivers/mtd | |
| parent | bec9cab9291bb221714d559a44fe37669a8ca604 (diff) | |
| parent | ceb70b466e75ceb1a621b6163f7e31116bfc8094 (diff) | |
| download | u-boot-a48ecc969f8d2d0fe9167962e9b8b4cca52de10b.zip u-boot-a48ecc969f8d2d0fe9167962e9b8b4cca52de10b.tar.gz u-boot-a48ecc969f8d2d0fe9167962e9b8b4cca52de10b.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
drivers/spi/Makefile
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/davinci_nand.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c index a974667..8ef18b8 100644 --- a/drivers/mtd/nand/davinci_nand.c +++ b/drivers/mtd/nand/davinci_nand.c @@ -386,9 +386,6 @@ static int nand_davinci_waitfunc(struct mtd_info *mtd, struct nand_chip *this) static void nand_flash_init(void) { u_int32_t acfg1 = 0x3ffffffc; - u_int32_t acfg2 = 0x3ffffffc; - u_int32_t acfg3 = 0x3ffffffc; - u_int32_t acfg4 = 0x3ffffffc; emifregs emif_regs; /*------------------------------------------------------------------* @@ -413,12 +410,9 @@ static void nand_flash_init(void) emif_regs = (emifregs)DAVINCI_ASYNC_EMIF_CNTRL_BASE; - emif_regs->AWCCR |= 0x10000000; - emif_regs->AB1CR = acfg1; /* 0x08244128 */; - emif_regs->AB2CR = acfg2; - emif_regs->AB3CR = acfg3; - emif_regs->AB4CR = acfg4; - emif_regs->NANDFCR = 0x00000101; + emif_regs->AB1CR = acfg1; /* CS2 */ + + emif_regs->NANDFCR = 0x00000101; /* NAND flash on CS2 */ } int board_nand_init(struct nand_chip *nand) |