diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-03-23 10:22:41 +0100 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-03-23 10:22:41 +0100 |
| commit | 8206bfae3ab7f99965136384360ba2de0c6f4c3b (patch) | |
| tree | e11bf0fad2e418e6771e8db7dbcb6630a6053f0c /board/atmel/atstk1000/atstk1000.c | |
| parent | ee1702d75a30d076139d1841383a1fa7220a0e11 (diff) | |
| parent | 58a518c3d8a2c7de11d414e8b903495daee7dc7e (diff) | |
| download | u-boot-imx-8206bfae3ab7f99965136384360ba2de0c6f4c3b.zip u-boot-imx-8206bfae3ab7f99965136384360ba2de0c6f4c3b.tar.gz u-boot-imx-8206bfae3ab7f99965136384360ba2de0c6f4c3b.tar.bz2 | |
Merge branch 'mimc200'
Diffstat (limited to 'board/atmel/atstk1000/atstk1000.c')
| -rw-r--r-- | board/atmel/atstk1000/atstk1000.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/board/atmel/atstk1000/atstk1000.c b/board/atmel/atstk1000/atstk1000.c index 94523b5..c36cb57 100644 --- a/board/atmel/atstk1000/atstk1000.c +++ b/board/atmel/atstk1000/atstk1000.c @@ -24,8 +24,8 @@ #include <asm/io.h> #include <asm/sdram.h> #include <asm/arch/clk.h> -#include <asm/arch/gpio.h> #include <asm/arch/hmatrix.h> +#include <asm/arch/portmux.h> #include <netdev.h> DECLARE_GLOBAL_DATA_PTR; @@ -78,14 +78,14 @@ int board_early_init_f(void) /* Enable SDRAM in the EBI mux */ hmatrix_slave_write(EBI, SFR, HMATRIX_BIT(EBI_SDRAM_ENABLE)); - gpio_enable_ebi(); - gpio_enable_usart1(); + portmux_enable_ebi(sdram_config.data_bits, 23, 0, PORTMUX_DRIVE_HIGH); + portmux_enable_usart1(PORTMUX_DRIVE_MIN); #if defined(CONFIG_MACB) - gpio_enable_macb0(); - gpio_enable_macb1(); + portmux_enable_macb0(PORTMUX_MACB_MII, PORTMUX_DRIVE_LOW); + portmux_enable_macb1(PORTMUX_MACB_MII, PORTMUX_DRIVE_LOW); #endif #if defined(CONFIG_MMC) - gpio_enable_mmci(); + portmux_enable_mmci(0, PORTMUX_MMCI_4BIT, PORTMUX_DRIVE_LOW); #endif return 0; @@ -111,10 +111,11 @@ phys_size_t initdram(int board_type) return actual_size; } -void board_init_info(void) +int board_early_init_r(void) { gd->bd->bi_phy_id[0] = 0x10; gd->bd->bi_phy_id[1] = 0x11; + return 0; } #ifdef CONFIG_CMD_NET |