diff options
Diffstat (limited to 'arch/avr32/boards/atstk1000/flash.c')
-rw-r--r-- | arch/avr32/boards/atstk1000/flash.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/avr32/boards/atstk1000/flash.c b/arch/avr32/boards/atstk1000/flash.c index aac4300cca1..3d0a102ad45 100644 --- a/arch/avr32/boards/atstk1000/flash.c +++ b/arch/avr32/boards/atstk1000/flash.c | |||
@@ -15,7 +15,7 @@ | |||
15 | 15 | ||
16 | #include <asm/arch/smc.h> | 16 | #include <asm/arch/smc.h> |
17 | 17 | ||
18 | static struct smc_config flash_config __initdata = { | 18 | static struct smc_timing flash_timing __initdata = { |
19 | .ncs_read_setup = 0, | 19 | .ncs_read_setup = 0, |
20 | .nrd_setup = 40, | 20 | .nrd_setup = 40, |
21 | .ncs_write_setup = 0, | 21 | .ncs_write_setup = 0, |
@@ -28,7 +28,9 @@ static struct smc_config flash_config __initdata = { | |||
28 | 28 | ||
29 | .read_cycle = 120, | 29 | .read_cycle = 120, |
30 | .write_cycle = 120, | 30 | .write_cycle = 120, |
31 | }; | ||
31 | 32 | ||
33 | static struct smc_config flash_config __initdata = { | ||
32 | .bus_width = 2, | 34 | .bus_width = 2, |
33 | .nrd_controlled = 1, | 35 | .nrd_controlled = 1, |
34 | .nwe_controlled = 1, | 36 | .nwe_controlled = 1, |
@@ -82,6 +84,7 @@ static int __init atstk1000_flash_init(void) | |||
82 | { | 84 | { |
83 | int ret; | 85 | int ret; |
84 | 86 | ||
87 | smc_set_timing(&flash_config, &flash_timing); | ||
85 | ret = smc_set_configuration(0, &flash_config); | 88 | ret = smc_set_configuration(0, &flash_config); |
86 | if (ret < 0) { | 89 | if (ret < 0) { |
87 | printk(KERN_ERR "atstk1000: failed to set NOR flash timing\n"); | 90 | printk(KERN_ERR "atstk1000: failed to set NOR flash timing\n"); |