Merge git://www.denx.de/git/u-boot-marvell

[u-boot] / board / atmel / at91sam9n12ek / at91sam9n12ek.c

diff --git a/board/atmel/at91sam9n12ek/at91sam9n12ek.c b/board/atmel/at91sam9n12ek/at91sam9n12ek.c
index 4f46a0353338be729a01b6d2d71994449bf0214c..fec93165c1b038c6f51135d3cc6a87627900300a 100644 (file)
--- a/board/atmel/at91sam9n12ek/at91sam9n12ek.c
+++ b/board/atmel/at91sam9n12ek/at91sam9n12ek.c
@@ -10,13 +10,12 @@
 #include <asm/arch/at91sam9x5_matrix.h>
 #include <asm/arch/at91sam9_smc.h>
 #include <asm/arch/at91_common.h>
-#include <asm/arch/at91_pmc.h>
 #include <asm/arch/at91_rstc.h>
 #include <asm/arch/at91_pio.h>
 #include <asm/arch/clk.h>
+#include <debug_uart.h>
 #include <lcd.h>
 #include <atmel_hlcdc.h>
-#include <atmel_mci.h>
 #include <netdev.h>
 
 #ifdef CONFIG_LCD_INFO
@@ -72,10 +71,10 @@ static void at91sam9n12ek_nand_hw_init(void)
        /* Configure ENABLE pin for NandFlash */
        at91_set_pio_output(AT91_PIO_PORTD, 4, 1);
 
-       at91_set_a_periph(AT91_PIO_PORTD, 0, 1);    /* NAND OE */
-       at91_set_a_periph(AT91_PIO_PORTD, 1, 1);    /* NAND WE */
-       at91_set_a_periph(AT91_PIO_PORTD, 2, 1);    /* ALE */
-       at91_set_a_periph(AT91_PIO_PORTD, 3, 1);    /* CLE */
+       at91_pio3_set_a_periph(AT91_PIO_PORTD, 0, 1);    /* NAND OE */
+       at91_pio3_set_a_periph(AT91_PIO_PORTD, 1, 1);    /* NAND WE */
+       at91_pio3_set_a_periph(AT91_PIO_PORTD, 2, 1);    /* ALE */
+       at91_pio3_set_a_periph(AT91_PIO_PORTD, 3, 1);    /* CLE */
 }
 #endif
 
@@ -125,7 +124,7 @@ void lcd_show_board_info(void)
                dram_size += gd->bd->bi_dram[i].size;
        nand_size = 0;
        for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++)
-               nand_size += nand_info[i].size;
+               nand_size += get_nand_dev_by_index(i)->size;
        lcd_printf("  %ld MB SDRAM, %ld MB NAND\n",
                dram_size >> 20,
                nand_size >> 20);
@@ -133,48 +132,6 @@ void lcd_show_board_info(void)
 #endif /* CONFIG_LCD_INFO */
 #endif /* CONFIG_LCD */
 
-/* SPI chip select control */
-#ifdef CONFIG_ATMEL_SPI
-#include <spi.h>
-int spi_cs_is_valid(unsigned int bus, unsigned int cs)
-{
-       return bus == 0 && cs < 2;
-}
-
-void spi_cs_activate(struct spi_slave *slave)
-{
-       switch (slave->cs) {
-       case 0:
-               at91_set_pio_output(AT91_PIO_PORTA, 14, 0);
-               break;
-       case 1:
-               at91_set_pio_output(AT91_PIO_PORTA, 7, 0);
-               break;
-       }
-}
-
-void spi_cs_deactivate(struct spi_slave *slave)
-{
-       switch (slave->cs) {
-       case 0:
-               at91_set_pio_output(AT91_PIO_PORTA, 14, 1);
-               break;
-       case 1:
-               at91_set_pio_output(AT91_PIO_PORTA, 7, 1);
-               break;
-       }
-}
-#endif /* CONFIG_ATMEL_SPI */
-
-#ifdef CONFIG_GENERIC_ATMEL_MCI
-int board_mmc_init(bd_t *bd)
-{
-       at91_mci_hw_init();
-
-       return atmel_mci_init((void *)ATMEL_BASE_HSMCI0);
-}
-#endif
-
 #ifdef CONFIG_KS8851_MLL
 void at91sam9n12ek_ks8851_hw_init(void)
 {
@@ -195,7 +152,7 @@ void at91sam9n12ek_ks8851_hw_init(void)
               &smc->cs[2].mode);
 
        /* Configure NCS2 PIN */
-       at91_set_b_periph(AT91_PIO_PORTD, 19, 0);
+       at91_pio3_set_b_periph(AT91_PIO_PORTD, 19, 0);
 }
 #endif
 
@@ -206,15 +163,22 @@ void at91sam9n12ek_usb_hw_init(void)
 }
 #endif
 
-int board_early_init_f(void)
+#ifdef CONFIG_DEBUG_UART_BOARD_INIT
+void board_debug_uart_init(void)
 {
-       /* Enable clocks for all PIOs */
-       struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
-       writel((1 << ATMEL_ID_PIOAB) | (1 << ATMEL_ID_PIOCD), &pmc->pcer);
-
        at91_seriald_hw_init();
+}
+#endif
+
+#ifdef CONFIG_BOARD_EARLY_INIT_F
+int board_early_init_f(void)
+{
+#ifdef CONFIG_DEBUG_UART
+       debug_uart_init();
+#endif
        return 0;
 }
+#endif
 
 int board_init(void)
 {
@@ -225,10 +189,6 @@ int board_init(void)
        at91sam9n12ek_nand_hw_init();
 #endif
 
-#ifdef CONFIG_ATMEL_SPI
-       at91_spi0_hw_init(1 << 0);
-#endif
-
 #ifdef CONFIG_LCD
        at91_lcd_hw_init();
 #endif
@@ -274,7 +234,7 @@ void at91_spl_board_init(void)
 }
 
 #include <asm/arch/atmel_mpddrc.h>
-static void ddr2_conf(struct atmel_mpddr *ddr2)
+static void ddr2_conf(struct atmel_mpddrc_config *ddr2)
 {
        ddr2->md = (ATMEL_MPDDRC_MD_DBW_16_BITS | ATMEL_MPDDRC_MD_DDR2_SDRAM);
 
@@ -310,13 +270,13 @@ void mem_init(void)
 {
        struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
        struct at91_matrix *matrix = (struct at91_matrix *)ATMEL_BASE_MATRIX;
-       struct atmel_mpddr ddr2;
+       struct atmel_mpddrc_config ddr2;
        unsigned long csa;
 
        ddr2_conf(&ddr2);
 
        /* enable DDR2 clock */
-       writel(0x4, &pmc->scer);
+       writel(AT91_PMC_DDR, &pmc->scer);
 
        /* Chip select 1 is for DDR2/SDRAM */
        csa = readl(&matrix->ebicsa);
@@ -327,6 +287,6 @@ void mem_init(void)
        writel(csa, &matrix->ebicsa);
 
        /* DDRAM2 Controller initialize */
-       ddr2_init(ATMEL_BASE_CS1, &ddr2);
+       ddr2_init(ATMEL_BASE_DDRSDRC, ATMEL_BASE_CS1, &ddr2);
 }
 #endif