diff options
Diffstat (limited to 'arch/arm/mach-at91/board-at572d940hf_ek.c')
-rw-r--r-- | arch/arm/mach-at91/board-at572d940hf_ek.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-at91/board-at572d940hf_ek.c b/arch/arm/mach-at91/board-at572d940hf_ek.c index 3929f1c9e4e5..096b99f4b1f3 100644 --- a/arch/arm/mach-at91/board-at572d940hf_ek.c +++ b/arch/arm/mach-at91/board-at572d940hf_ek.c | |||
@@ -41,6 +41,7 @@ | |||
41 | #include <mach/board.h> | 41 | #include <mach/board.h> |
42 | #include <mach/gpio.h> | 42 | #include <mach/gpio.h> |
43 | #include <mach/at91sam9_smc.h> | 43 | #include <mach/at91sam9_smc.h> |
44 | #include <mach/system_rev.h> | ||
44 | 45 | ||
45 | #include "sam9_smc.h" | 46 | #include "sam9_smc.h" |
46 | #include "generic.h" | 47 | #include "generic.h" |
@@ -216,11 +217,6 @@ static struct atmel_nand_data __initdata eb_nand_data = { | |||
216 | /* .rdy_pin = AT91_PIN_PC16, */ | 217 | /* .rdy_pin = AT91_PIN_PC16, */ |
217 | .enable_pin = AT91_PIN_PA15, | 218 | .enable_pin = AT91_PIN_PA15, |
218 | .partition_info = nand_partitions, | 219 | .partition_info = nand_partitions, |
219 | #if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16) | ||
220 | .bus_width_16 = 1, | ||
221 | #else | ||
222 | .bus_width_16 = 0, | ||
223 | #endif | ||
224 | }; | 220 | }; |
225 | 221 | ||
226 | static struct sam9_smc_config __initdata eb_nand_smc_config = { | 222 | static struct sam9_smc_config __initdata eb_nand_smc_config = { |
@@ -243,6 +239,7 @@ static struct sam9_smc_config __initdata eb_nand_smc_config = { | |||
243 | 239 | ||
244 | static void __init eb_add_device_nand(void) | 240 | static void __init eb_add_device_nand(void) |
245 | { | 241 | { |
242 | ek_nand_data.bus_width_16 = !board_have_nand_8bit(); | ||
246 | /* setup bus-width (8 or 16) */ | 243 | /* setup bus-width (8 or 16) */ |
247 | if (eb_nand_data.bus_width_16) | 244 | if (eb_nand_data.bus_width_16) |
248 | eb_nand_smc_config.mode |= AT91_SMC_DBW_16; | 245 | eb_nand_smc_config.mode |= AT91_SMC_DBW_16; |