diff options
Diffstat (limited to 'arch/arm/mach-at91/at91sam9261_devices.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9261_devices.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c index 728bb8f3944..ec1891375df 100644 --- a/arch/arm/mach-at91/at91sam9261_devices.c +++ b/arch/arm/mach-at91/at91sam9261_devices.c | |||
| @@ -232,19 +232,19 @@ void __init at91_add_device_nand(struct at91_nand_data *data) | |||
| 232 | at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA); | 232 | at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA); |
| 233 | 233 | ||
| 234 | /* set the bus interface characteristics */ | 234 | /* set the bus interface characteristics */ |
| 235 | at91_sys_write(AT91_SMC_SETUP(3), AT91_SMC_NWESETUP_(0) | AT91_SMC_NCS_WRSETUP_(0) | 235 | at91_sys_write(AT91_SMC_SETUP(3), AT91_SMC_NWESETUP_(1) | AT91_SMC_NCS_WRSETUP_(0) |
| 236 | | AT91_SMC_NRDSETUP_(0) | AT91_SMC_NCS_RDSETUP_(0)); | 236 | | AT91_SMC_NRDSETUP_(1) | AT91_SMC_NCS_RDSETUP_(0)); |
| 237 | 237 | ||
| 238 | at91_sys_write(AT91_SMC_PULSE(3), AT91_SMC_NWEPULSE_(2) | AT91_SMC_NCS_WRPULSE_(5) | 238 | at91_sys_write(AT91_SMC_PULSE(3), AT91_SMC_NWEPULSE_(3) | AT91_SMC_NCS_WRPULSE_(3) |
| 239 | | AT91_SMC_NRDPULSE_(2) | AT91_SMC_NCS_RDPULSE_(5)); | 239 | | AT91_SMC_NRDPULSE_(3) | AT91_SMC_NCS_RDPULSE_(3)); |
| 240 | 240 | ||
| 241 | at91_sys_write(AT91_SMC_CYCLE(3), AT91_SMC_NWECYCLE_(7) | AT91_SMC_NRDCYCLE_(7)); | 241 | at91_sys_write(AT91_SMC_CYCLE(3), AT91_SMC_NWECYCLE_(5) | AT91_SMC_NRDCYCLE_(5)); |
| 242 | 242 | ||
| 243 | if (data->bus_width_16) | 243 | if (data->bus_width_16) |
| 244 | mode = AT91_SMC_DBW_16; | 244 | mode = AT91_SMC_DBW_16; |
| 245 | else | 245 | else |
| 246 | mode = AT91_SMC_DBW_8; | 246 | mode = AT91_SMC_DBW_8; |
| 247 | at91_sys_write(AT91_SMC_MODE(3), mode | AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_TDF_(1)); | 247 | at91_sys_write(AT91_SMC_MODE(3), mode | AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_TDF_(2)); |
| 248 | 248 | ||
| 249 | /* enable pin */ | 249 | /* enable pin */ |
| 250 | if (data->enable_pin) | 250 | if (data->enable_pin) |
| @@ -544,10 +544,10 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) | |||
| 544 | struct resource *fb_res = &lcdc_resources[2]; | 544 | struct resource *fb_res = &lcdc_resources[2]; |
| 545 | size_t fb_len = fb_res->end - fb_res->start + 1; | 545 | size_t fb_len = fb_res->end - fb_res->start + 1; |
| 546 | 546 | ||
| 547 | fb = ioremap_writecombine(fb_res->start, fb_len); | 547 | fb = ioremap(fb_res->start, fb_len); |
| 548 | if (fb) { | 548 | if (fb) { |
| 549 | memset(fb, 0, fb_len); | 549 | memset(fb, 0, fb_len); |
| 550 | iounmap(fb, fb_len); | 550 | iounmap(fb); |
| 551 | } | 551 | } |
| 552 | } | 552 | } |
| 553 | lcdc_data = *data; | 553 | lcdc_data = *data; |