]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
arm: at91: at91sam9m10g45ek/corvus remove useless chip select 1 init
authorErik van Luijk <evanluijk@interact.nl>
Thu, 13 Aug 2015 13:43:19 +0000 (15:43 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Thu, 10 Sep 2015 08:30:32 +0000 (10:30 +0200)
On these boards the DDR is connected to a dedicated controller and not
to chip select 1 of the EBI.

Signed-off-by: Erik van Luijk <evanluijk@interact.nl>
Tested-by: Erik van Luijk <evanluijk@interact.nl>
board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
board/siemens/corvus/board.c

index 3e65d711c0cc30dcd04b15b055cec67f70fb8810..d2ade4d0664c634ece3011e624c3d579395b3d28 100644 (file)
@@ -131,21 +131,13 @@ static void ddr2_conf(struct atmel_mpddr *ddr2)
 void mem_init(void)
 {
        struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
-       struct at91_matrix *mat = (struct at91_matrix *)ATMEL_BASE_MATRIX;
        struct atmel_mpddr ddr2;
-       unsigned long csa;
 
        ddr2_conf(&ddr2);
 
        /* enable DDR2 clock */
        writel(0x4, &pmc->scer);
 
-       /* Chip select 1 is for DDR2/SDRAM */
-       csa = readl(&mat->ebicsa);
-       csa |= AT91_MATRIX_EBI_CS1A_SDRAMC;
-       csa &= ~AT91_MATRIX_EBI_VDDIOMSEL_3_3V;
-       writel(csa, &mat->ebicsa);
-
        /* DDRAM2 Controller initialize */
        ddr2_init(ATMEL_BASE_DDRSDRC0, ATMEL_BASE_CS6, &ddr2);
 }
index 9001fcbcf50ef0fea76fabbf6cab30c15ed6b8cc..d74743f74cbb14711a8e3a930938b356bfc8a091 100644 (file)
@@ -144,21 +144,13 @@ static void ddr2_conf(struct atmel_mpddr *ddr2)
 void mem_init(void)
 {
        struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
-       struct at91_matrix *mat = (struct at91_matrix *)ATMEL_BASE_MATRIX;
        struct atmel_mpddr ddr2;
-       unsigned long csa;
 
        ddr2_conf(&ddr2);
 
        /* enable DDR2 clock */
        writel(0x4, &pmc->scer);
 
-       /* Chip select 1 is for DDR2/SDRAM */
-       csa = readl(&mat->ebicsa);
-       csa |= AT91_MATRIX_EBI_CS1A_SDRAMC;
-       csa &= ~AT91_MATRIX_EBI_VDDIOMSEL_3_3V;
-       writel(csa, &mat->ebicsa);
-
        /* DDRAM2 Controller initialize */
        ddr2_init(ATMEL_BASE_DDRSDRC0, ATMEL_BASE_CS6, &ddr2);
 }