diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:02:32 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:02:32 +0100 |
| commit | 9749c2f16f61048a66a98a95b6a1e88d4f491cf0 (patch) | |
| tree | 529b4a220e337e6450d810b88c49c08c32f65ed6 /arch/arm/mach-at91/at91sam9x5_devices.c | |
| parent | 856f60dbd157126241cf9033514137849bb5ca22 (diff) | |
| parent | 4104dd917388943f5b0ae87d1360738675c338b0 (diff) | |
| download | barebox-9749c2f16f61048a66a98a95b6a1e88d4f491cf0.tar.gz barebox-9749c2f16f61048a66a98a95b6a1e88d4f491cf0.tar.xz | |
Merge branch 'for-next/mtd'
Conflicts:
arch/arm/configs/at91sam9x5ek_defconfig
Diffstat (limited to 'arch/arm/mach-at91/at91sam9x5_devices.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9x5_devices.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/at91sam9x5_devices.c b/arch/arm/mach-at91/at91sam9x5_devices.c index 14fcb1e6af..b804b41344 100644 --- a/arch/arm/mach-at91/at91sam9x5_devices.c +++ b/arch/arm/mach-at91/at91sam9x5_devices.c @@ -198,9 +198,19 @@ static struct resource nand_resources[] = { }, [1] = { .start = AT91_BASE_SYS + AT91_PMECC, - .end = AT91_BASE_SYS + AT91_PMECC + 512 - 1, + .end = AT91_BASE_SYS + AT91_PMECC + 0x600 - 1, .flags = IORESOURCE_MEM, - } + }, + [2] = { + .start = AT91_BASE_SYS + AT91_PMERRLOC, + .end = AT91_BASE_SYS + AT91_PMERRLOC + 0x200 - 1, + .flags = IORESOURCE_MEM, + }, + [3] = { + .start = AT91SAM9X5_ROM_BASE, + .end = AT91SAM9X5_ROM_BASE + AT91SAM9X5_ROM_SIZE - 1, + .flags = IORESOURCE_MEM, + }, }; void __init at91_add_device_nand(struct atmel_nand_data *data) @@ -213,6 +223,8 @@ void __init at91_add_device_nand(struct atmel_nand_data *data) csa = at91_sys_read(AT91_MATRIX_EBICSA); at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_EBI_CS3A_SMC_NANDFLASH); + data->pmecc_lookup_table_offset = 0x8000; + /* enable pin */ if (data->enable_pin) at91_set_gpio_output(data->enable_pin, 1); |