summaryrefslogtreecommitdiff
path: root/board/atmel/at91sam9rlek
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-07-07 00:47:58 +0200
committerWolfgang Denk <wd@denx.de>2008-07-07 00:47:58 +0200
commit4e0018f1cf91b3f38f8478d6a174c198b72fe6df (patch)
tree8f94730386fbc7721109cbd71379ea55e5fd7f00 /board/atmel/at91sam9rlek
parentb223017f081d7e0daa33ad17a3cd05b0c1f7d9ba (diff)
parentd3bcdf838e2991d58571308fa6e04ca335bc06e8 (diff)
downloadu-boot-imx-4e0018f1cf91b3f38f8478d6a174c198b72fe6df.zip
u-boot-imx-4e0018f1cf91b3f38f8478d6a174c198b72fe6df.tar.gz
u-boot-imx-4e0018f1cf91b3f38f8478d6a174c198b72fe6df.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-at91
Diffstat (limited to 'board/atmel/at91sam9rlek')
-rw-r--r--board/atmel/at91sam9rlek/at91sam9rlek.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/board/atmel/at91sam9rlek/at91sam9rlek.c b/board/atmel/at91sam9rlek/at91sam9rlek.c
index 10423d2..509e7c3 100644
--- a/board/atmel/at91sam9rlek/at91sam9rlek.c
+++ b/board/atmel/at91sam9rlek/at91sam9rlek.c
@@ -82,13 +82,13 @@ static void at91sam9rlek_nand_hw_init(void)
/* Configure SMC CS3 for NAND/SmartMedia */
at91_sys_write(AT91_SMC_SETUP(3),
- AT91_SMC_NWESETUP_(0) | AT91_SMC_NCS_WRSETUP_(0) |
- AT91_SMC_NRDSETUP_(0) | AT91_SMC_NCS_RDSETUP_(0));
+ AT91_SMC_NWESETUP_(1) | AT91_SMC_NCS_WRSETUP_(0) |
+ AT91_SMC_NRDSETUP_(1) | AT91_SMC_NCS_RDSETUP_(0));
at91_sys_write(AT91_SMC_PULSE(3),
- AT91_SMC_NWEPULSE_(2) | AT91_SMC_NCS_WRPULSE_(5) |
- AT91_SMC_NRDPULSE_(2) | AT91_SMC_NCS_RDPULSE_(5));
+ AT91_SMC_NWEPULSE_(3) | AT91_SMC_NCS_WRPULSE_(3) |
+ AT91_SMC_NRDPULSE_(3) | AT91_SMC_NCS_RDPULSE_(3));
at91_sys_write(AT91_SMC_CYCLE(3),
- AT91_SMC_NWECYCLE_(7) | AT91_SMC_NRDCYCLE_(7));
+ AT91_SMC_NWECYCLE_(5) | AT91_SMC_NRDCYCLE_(5));
at91_sys_write(AT91_SMC_MODE(3),
AT91_SMC_READMODE | AT91_SMC_WRITEMODE |
AT91_SMC_EXNWMODE_DISABLE |
@@ -97,7 +97,7 @@ static void at91sam9rlek_nand_hw_init(void)
#else /* CFG_NAND_DBW_8 */
AT91_SMC_DBW_8 |
#endif
- AT91_SMC_TDF_(1));
+ AT91_SMC_TDF_(2));
at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9RL_ID_PIOD);