Merge branch 'master' of git://git.denx.de/u-boot-imx

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

diff --git a/board/atmel/at91cap9adk/at91cap9adk.c b/board/atmel/at91cap9adk/at91cap9adk.c
index 18a0e9d6f49de0a521686972c54b66d1dfc2ecd3..2ab8bc2c430ff1fc3b1e43dc6433b3add69cea9a 100644 (file)
--- a/board/atmel/at91cap9adk/at91cap9adk.c
+++ b/board/atmel/at91cap9adk/at91cap9adk.c
@@ -29,6 +29,7 @@
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_pmc.h>
 #include <asm/arch/at91_rstc.h>
+#include <asm/arch/clk.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/io.h>
 #include <asm/arch/hardware.h>
@@ -60,7 +61,6 @@ static void at91cap9_slowclock_hw_init(void)
        if (at91_sys_read(AT91_PMC_VER) == ARCH_ID_AT91CAP9_REVC) {
                unsigned i, tmp = at91_sys_read(AT91_SCKCR);
                if ((tmp & AT91CAP9_SCKCR_OSCSEL) == AT91CAP9_SCKCR_OSCSEL_RC) {
-                       extern void timer_init(void);
                        timer_init();
                        tmp |= AT91CAP9_SCKCR_OSC32EN;
                        at91_sys_write(AT91_SCKCR, tmp);
@@ -133,21 +133,7 @@ static void at91cap9_nand_hw_init(void)
        /* RDY/BSY is not connected */
 
        /* Enable NandFlash */
-       at91_set_gpio_output(AT91_PIN_PD15, 1);
-}
-#endif
-
-#ifdef CONFIG_HAS_DATAFLASH
-static void at91cap9_spi_hw_init(void)
-{
-       at91_set_B_periph(AT91_PIN_PA5, 0);     /* SPI0_NPCS0 */
-
-       at91_set_B_periph(AT91_PIN_PA0, 0);     /* SPI0_MISO */
-       at91_set_B_periph(AT91_PIN_PA1, 0);     /* SPI0_MOSI */
-       at91_set_B_periph(AT91_PIN_PA2, 0);     /* SPI0_SPCK */
-
-       /* Enable clock */
-       at91_sys_write(AT91_PMC_PCER, 1 << AT91CAP9_ID_SPI0);
+       at91_set_gpio_output(CONFIG_SYS_NAND_ENABLE_PIN, 1);
 }
 #endif
 
@@ -191,27 +177,8 @@ static void at91cap9_macb_hw_init(void)
               pin_to_mask(AT91_PIN_PB26),
               pin_to_controller(AT91_PIN_PA0) + PIO_PUER);
 
-       at91_set_A_periph(AT91_PIN_PB21, 0);    /* ETXCK_EREFCK */
-       at91_set_A_periph(AT91_PIN_PB22, 0);    /* ERXDV */
-       at91_set_A_periph(AT91_PIN_PB25, 0);    /* ERX0 */
-       at91_set_A_periph(AT91_PIN_PB26, 0);    /* ERX1 */
-       at91_set_A_periph(AT91_PIN_PB27, 0);    /* ERXER */
-       at91_set_A_periph(AT91_PIN_PB28, 0);    /* ETXEN */
-       at91_set_A_periph(AT91_PIN_PB23, 0);    /* ETX0 */
-       at91_set_A_periph(AT91_PIN_PB24, 0);    /* ETX1 */
-       at91_set_A_periph(AT91_PIN_PB30, 0);    /* EMDIO */
-       at91_set_A_periph(AT91_PIN_PB29, 0);    /* EMDC */
-
-#ifndef CONFIG_RMII
-       at91_set_B_periph(AT91_PIN_PC25, 0);    /* ECRS */
-       at91_set_B_periph(AT91_PIN_PC26, 0);    /* ECOL */
-       at91_set_B_periph(AT91_PIN_PC22, 0);    /* ERX2 */
-       at91_set_B_periph(AT91_PIN_PC23, 0);    /* ERX3 */
-       at91_set_B_periph(AT91_PIN_PC27, 0);    /* ERXCK */
-       at91_set_B_periph(AT91_PIN_PC20, 0);    /* ETX2 */
-       at91_set_B_periph(AT91_PIN_PC21, 0);    /* ETX3 */
-       at91_set_B_periph(AT91_PIN_PC24, 0);    /* ETXER */
-#endif
+       at91_macb_hw_init();
+
        /* Unlock EMAC, 3 0 2 1 sequence */
 #define MP_MAC_KEY0    0x5969cb2a
 #define MP_MAC_KEY1    0xb4a1872e
@@ -315,8 +282,8 @@ void lcd_show_board_info(void)
        lcd_printf ("(C) 2008 ATMEL Corp\n");
        lcd_printf ("at91support@atmel.com\n");
        lcd_printf ("%s CPU at %s MHz\n",
-               AT91_CPU_NAME,
-               strmhz(temp, AT91_CPU_CLOCK));
+               CONFIG_SYS_AT91_CPU_NAME,
+               strmhz(temp, get_cpu_clk_rate()));
 
        dram_size = 0;
        for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++)
@@ -348,7 +315,7 @@ int board_init(void)
        at91cap9_nand_hw_init();
 #endif
 #ifdef CONFIG_HAS_DATAFLASH
-       at91cap9_spi_hw_init();
+       at91_spi0_hw_init(1 << 0);
 #endif
 #ifdef CONFIG_MACB
        at91cap9_macb_hw_init();
@@ -372,13 +339,6 @@ int dram_init(void)
 #ifdef CONFIG_RESET_PHY_R
 void reset_phy(void)
 {
-#ifdef CONFIG_MACB
-       /*
-        * Initialize ethernet HW addr prior to starting Linux,
-        * needed for nfsroot
-        */
-       eth_init(gd->bd);
-#endif
 }
 #endif