diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-11-05 11:03:23 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-11-05 15:53:42 +0100 |
| commit | eaa7fcf934826d519f532227c304c09a62cfe685 (patch) | |
| tree | 6d2e914ed848b16fd0a4329d5ff7828fca4e02bc /arch/arm/mach-at91/at91sam9n12_devices.c | |
| parent | d1484e97fab68cf162fce46086fe54c11075aec8 (diff) | |
| download | barebox-eaa7fcf934826d519f532227c304c09a62cfe685.tar.gz barebox-eaa7fcf934826d519f532227c304c09a62cfe685.tar.xz | |
ARM: at91: Add SoC namespace to matrix defines
Add SoC namespace to matrix define so we have one source less of
conflicting defines.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-at91/at91sam9n12_devices.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9n12_devices.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-at91/at91sam9n12_devices.c b/arch/arm/mach-at91/at91sam9n12_devices.c index 84c871c6e8..e38fc77363 100644 --- a/arch/arm/mach-at91/at91sam9n12_devices.c +++ b/arch/arm/mach-at91/at91sam9n12_devices.c @@ -158,19 +158,19 @@ void __init at91_add_device_nand(struct atmel_nand_data *data) data->pmecc_lookup_table_offset = 0x8000; - csa = at91_sys_read(AT91_MATRIX_EBICSA); + csa = readl(AT91SAM9N12_BASE_MATRIX + AT91SAM9N12_MATRIX_EBICSA); /* Assign CS3 to NAND/SmartMedia Interface */ - csa |= AT91_MATRIX_EBI_CS3A_SMC_NANDFLASH; + csa |= AT91SAM9N12_MATRIX_EBI_CS3A_SMC_NANDFLASH; /* Configure databus */ if (!data->bus_on_d0) - csa |= AT91_MATRIX_NFD0_ON_D16; + csa |= AT91SAM9N12_MATRIX_NFD0_ON_D16; else - csa &= ~AT91_MATRIX_NFD0_ON_D16; + csa &= ~AT91SAM9N12_MATRIX_NFD0_ON_D16; /* Configure IO drive */ - csa |= AT91_MATRIX_EBI_HIGH_DRIVE; + csa |= AT91SAM9N12_MATRIX_EBI_HIGH_DRIVE; - at91_sys_write(AT91_MATRIX_EBICSA, csa); + writel(csa, AT91SAM9N12_BASE_MATRIX + AT91SAM9N12_MATRIX_EBICSA); /* enable pin */ if (gpio_is_valid(data->enable_pin)) |