diff options
Diffstat (limited to 'arch/arm/mach-at91/at91sam9g45_devices.c')
-rw-r--r-- | arch/arm/mach-at91/at91sam9g45_devices.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c index 67ca3590c3..43d8d5fbd6 100644 --- a/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/arch/arm/mach-at91/at91sam9g45_devices.c @@ -21,7 +21,6 @@ #include <mach/at91_rtt.h> #include <mach/board.h> #include <mach/iomux.h> -#include <mach/io.h> #include <i2c/i2c-gpio.h> #include "generic.h" @@ -128,8 +127,8 @@ static struct resource nand_resources[] = { .flags = IORESOURCE_MEM, }, [1] = { - .start = AT91_BASE_SYS + AT91_ECC, - .end = AT91_BASE_SYS + AT91_ECC + 512 - 1, + .start = AT91SAM9G45_BASE_ECC, + .end = AT91SAM9G45_BASE_ECC + 512 - 1, .flags = IORESOURCE_MEM, } }; @@ -141,8 +140,9 @@ void at91_add_device_nand(struct atmel_nand_data *data) if (!data) return; - csa = at91_sys_read(AT91_MATRIX_EBICSA); - at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_EBI_CS3A_SMC_SMARTMEDIA); + csa = readl(AT91SAM9G45_BASE_MATRIX + AT91SAM9G45_MATRIX_EBICSA); + csa |= AT91SAM9G45_MATRIX_EBI_CS3A_SMC_SMARTMEDIA; + writel(csa, AT91SAM9G45_BASE_MATRIX + AT91SAM9G45_MATRIX_EBICSA); /* enable pin */ if (gpio_is_valid(data->enable_pin)) @@ -217,7 +217,7 @@ resource_size_t __init at91_configure_dbgu(void) at91_set_A_periph(AT91_PIN_PB12, 1); /* DRXD */ at91_set_A_periph(AT91_PIN_PB13, 0); /* DTXD */ - return AT91_BASE_SYS + AT91_DBGU; + return AT91SAM9G45_BASE_DBGU; } resource_size_t __init at91_configure_usart0(unsigned pins) |