diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-11-05 11:38:11 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-11-06 09:39:21 +0100 |
| commit | 99b0114fedef8a7f8dc5733d867c0ef6146bede1 (patch) | |
| tree | 875868fd937d8007638c3ee77d75ad5d04367981 /arch/arm/mach-at91/at91rm9200_devices.c | |
| parent | c67ac51bfad78c99478da00811c763ab646b8135 (diff) | |
| download | barebox-99b0114fedef8a7f8dc5733d867c0ef6146bede1.tar.gz barebox-99b0114fedef8a7f8dc5733d867c0ef6146bede1.tar.xz | |
ARM: at91rm9200: Add SoC namespace to memory controller defines
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-at91/at91rm9200_devices.c')
| -rw-r--r-- | arch/arm/mach-at91/at91rm9200_devices.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c index b4d7cb1e24..2563b6c834 100644 --- a/arch/arm/mach-at91/at91rm9200_devices.c +++ b/arch/arm/mach-at91/at91rm9200_devices.c @@ -135,15 +135,19 @@ void __init at91_add_device_nand(struct atmel_nand_data *data) return; /* enable the address range of CS3 */ - csa = at91_sys_read(AT91_EBI_CSA); - at91_sys_write(AT91_EBI_CSA, csa | AT91_EBI_CS3A_SMC_SMARTMEDIA); + csa = readl(AT91RM9200_BASE_MC + AT91RM9200_EBI_CSA); + csa |= AT91RM9200_EBI_CS3A_SMC_SMARTMEDIA; + writel(csa, AT91RM9200_BASE_MC + AT91RM9200_EBI_CSA); /* set the bus interface characteristics */ - at91_sys_write(AT91_SMC_CSR(3), AT91_SMC_ACSS_STD | AT91_SMC_DBW_8 | AT91_SMC_WSEN - | AT91_SMC_NWS_(5) - | AT91_SMC_TDF_(1) - | AT91_SMC_RWSETUP_(0) /* tDS Data Set up Time 30 - ns */ - | AT91_SMC_RWHOLD_(1) /* tDH Data Hold Time 20 - ns */ + writel(AT91RM9200_SMC_ACSS_STD | + AT91RM9200_SMC_DBW_8 | + AT91RM9200_SMC_WSEN | + AT91RM9200_SMC_NWS_(5) | + AT91RM9200_SMC_TDF_(1) | + AT91RM9200_SMC_RWSETUP_(0) | /* tDS Data Set up Time 30 - ns */ + AT91RM9200_SMC_RWHOLD_(1), /* tDH Data Hold Time 20 - ns */ + AT91RM9200_BASE_MC + AT91RM9200_SMC_CSR(3) ); /* enable pin */ |