diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-02-23 10:27:15 +0100 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-02-23 10:27:15 +0100 |
| commit | ea393eb1d6a786fc2e895f90abb5f7e7541aef45 (patch) | |
| tree | f8e264ecda76805863f9336d8c3712767984f373 /board/atmel/atstk1000/atstk1000.c | |
| parent | 32688e572ff96715b41420e9a7f280db6c399b65 (diff) | |
| parent | cb5473205206c7f14cbb1e747f28ec75b48826e2 (diff) | |
| download | u-boot-imx-ea393eb1d6a786fc2e895f90abb5f7e7541aef45.zip u-boot-imx-ea393eb1d6a786fc2e895f90abb5f7e7541aef45.tar.gz u-boot-imx-ea393eb1d6a786fc2e895f90abb5f7e7541aef45.tar.bz2 | |
Merge branch 'cleanups' into next
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 |