diff options
Diffstat (limited to 'arch/arm/boards/pm9261/lowlevel_init.c')
| -rw-r--r-- | arch/arm/boards/pm9261/lowlevel_init.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boards/pm9261/lowlevel_init.c b/arch/arm/boards/pm9261/lowlevel_init.c index a4cb8af697..0ab34b0db6 100644 --- a/arch/arm/boards/pm9261/lowlevel_init.c +++ b/arch/arm/boards/pm9261/lowlevel_init.c @@ -7,7 +7,7 @@ #include <asm/barebox-arm.h> #include <mach/at91sam926x_board_init.h> -#include <mach/at91sam9_matrix.h> +#include <mach/at91sam9261_matrix.h> #define MASTER_PLL_DIV 15 #define MASTER_PLL_MUL 162 @@ -28,7 +28,7 @@ static void __bare_init pm9261_board_config(struct at91sam926x_board_cfg *cfg) cfg->ebi_pio_ppudr = 0xFFFF0000; /* EBI0_CSA, CS1 SDRAM, CS3 NAND Flash, 3.3V memories */ cfg->ebi_csa = - AT91_MATRIX_DBPUC | AT91_MATRIX_CS1A_SDRAMC; + AT91SAM9261_MATRIX_DBPUC | AT91SAM9261_MATRIX_CS1A_SDRAMC; cfg->smc_cs = 0; cfg->smc_mode = @@ -102,10 +102,10 @@ static void __bare_init pm9261_init(void) cfg.pio = IOMEM(AT91SAM9261_BASE_PIOC); cfg.sdramc = IOMEM(AT91SAM9261_BASE_SDRAMC); cfg.ebi_pio_is_peripha = false; - cfg.matrix_csa = AT91_MATRIX_EBICSA; + cfg.matrix_csa = IOMEM(AT91SAM9261_BASE_MATRIX + AT91SAM9261_MATRIX_EBICSA); pm9261_board_config(&cfg); - at91sam926x_board_init(&cfg); + at91sam9261_board_init(&cfg); barebox_arm_entry(AT91_CHIPSELECT_1, at91_get_sdram_size(cfg.sdramc), NULL); |