git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
board-cap9adk.c
diff --git
a/arch/arm/mach-at91/board-cap9adk.c
b/arch/arm/mach-at91/board-cap9adk.c
index
1904fdf
..
cdb65d4
100644
(file)
--- a/
arch/arm/mach-at91/board-cap9adk.c
+++ b/
arch/arm/mach-at91/board-cap9adk.c
@@
-215,7
+215,7
@@
static void __init cap9adk_add_device_nand(void)
csa = at91_sys_read(AT91_MATRIX_EBICSA);
at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_EBI_VDDIOMSEL_3_3V);
csa = at91_sys_read(AT91_MATRIX_EBICSA);
at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_EBI_VDDIOMSEL_3_3V);
- cap9adk_nand_data.bus_width_16 =
!board_have_nand_8
bit();
+ cap9adk_nand_data.bus_width_16 =
board_have_nand_16
bit();
/* setup bus-width (8 or 16) */
if (cap9adk_nand_data.bus_width_16)
cap9adk_nand_smc_config.mode |= AT91_SMC_DBW_16;
/* setup bus-width (8 or 16) */
if (cap9adk_nand_data.bus_width_16)
cap9adk_nand_smc_config.mode |= AT91_SMC_DBW_16;