diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-12-16 23:00:53 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-12-16 23:00:53 +0100 |
| commit | 006915fbb0e3c1c9927fe32c4e92cb011f8499e7 (patch) | |
| tree | b477df920f7d638a0472aa1d6bfa5ff71243448c /drivers/mtd/nand/s3c2410_nand.c | |
| parent | 98e69567022eb2138dd99554b3a2e80522a1b153 (diff) | |
| parent | b5d58d8500bfb918c7fec56f241e6ee1078c2be0 (diff) | |
| download | u-boot-imx-006915fbb0e3c1c9927fe32c4e92cb011f8499e7.zip u-boot-imx-006915fbb0e3c1c9927fe32c4e92cb011f8499e7.tar.gz u-boot-imx-006915fbb0e3c1c9927fe32c4e92cb011f8499e7.tar.bz2 | |
Merge branch 'master' of ../master into next
Diffstat (limited to 'drivers/mtd/nand/s3c2410_nand.c')
| -rw-r--r-- | drivers/mtd/nand/s3c2410_nand.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/mtd/nand/s3c2410_nand.c b/drivers/mtd/nand/s3c2410_nand.c index f70daef..27351fb 100644 --- a/drivers/mtd/nand/s3c2410_nand.c +++ b/drivers/mtd/nand/s3c2410_nand.c @@ -133,9 +133,15 @@ int board_nand_init(struct nand_chip *nand) writel(readl(&clk_power->clkcon) | (1 << 4), &clk_power->clkcon); /* initialize hardware */ - twrph0 = 3; - twrph1 = 0; - tacls = 0; +#if defined(CONFIG_S3C24XX_CUSTOM_NAND_TIMING) + tacls = CONFIG_S3C24XX_TACLS; + twrph0 = CONFIG_S3C24XX_TWRPH0; + twrph1 = CONFIG_S3C24XX_TWRPH1; +#else + tacls = 4; + twrph0 = 8; + twrph1 = 8; +#endif cfg = S3C2410_NFCONF_EN; cfg |= S3C2410_NFCONF_TACLS(tacls - 1); |