summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-09-29 08:34:09 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-09-29 08:34:09 +0200
commitfa651cce4f89f6d33f1ea301a6f1f781758c7dfd (patch)
tree93e3bd623f5888f5ced1da0eea7473e98ee3e402 /board
parentd193c1b6eb05041c94ad9aacd8c94189d1dbc5f8 (diff)
parentdc3e30bab7c5ef87bd24ebcbb7cdfc3fb2b44555 (diff)
downloadu-boot-imx-fa651cce4f89f6d33f1ea301a6f1f781758c7dfd.zip
u-boot-imx-fa651cce4f89f6d33f1ea301a6f1f781758c7dfd.tar.gz
u-boot-imx-fa651cce4f89f6d33f1ea301a6f1f781758c7dfd.tar.bz2
Merge remote-tracking branch 'u-boot-atmel/master'
Diffstat (limited to 'board')
-rw-r--r--board/atmel/at91sam9x5ek/at91sam9x5ek.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/board/atmel/at91sam9x5ek/at91sam9x5ek.c b/board/atmel/at91sam9x5ek/at91sam9x5ek.c
index ae408bc..06028aa 100644
--- a/board/atmel/at91sam9x5ek/at91sam9x5ek.c
+++ b/board/atmel/at91sam9x5ek/at91sam9x5ek.c
@@ -62,6 +62,10 @@ static void at91sam9x5ek_nand_hw_init(void)
csa |= AT91_MATRIX_EBI_CS3A_SMC_SMARTMEDIA;
/* NAND flash on D16 */
csa |= AT91_MATRIX_NFD0_ON_D16;
+
+ /* Configure IO drive */
+ csa &= ~AT91_MATRIX_EBI_EBI_IOSR_NORMAL;
+
writel(csa, &matrix->ebicsa);
/* Configure SMC CS3 for NAND/SmartMedia */