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/earthlcd/favr-32-ezkit | |
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/earthlcd/favr-32-ezkit')
-rw-r--r-- | board/earthlcd/favr-32-ezkit/favr-32-ezkit.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/board/earthlcd/favr-32-ezkit/favr-32-ezkit.c b/board/earthlcd/favr-32-ezkit/favr-32-ezkit.c index da05589..8af680f 100644 --- a/board/earthlcd/favr-32-ezkit/favr-32-ezkit.c +++ b/board/earthlcd/favr-32-ezkit/favr-32-ezkit.c @@ -23,8 +23,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> DECLARE_GLOBAL_DATA_PTR; @@ -50,13 +50,13 @@ 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_usart3(); + portmux_enable_ebi(32, 23, 0, PORTMUX_DRIVE_HIGH); + portmux_enable_usart3(PORTMUX_DRIVE_MIN); #if defined(CONFIG_MACB) - gpio_enable_macb0(); + portmux_enable_macb0(PORTMUX_MACB_MII, PORTMUX_DRIVE_HIGH); #endif #if defined(CONFIG_MMC) - gpio_enable_mmci(); + portmux_enable_mmci(0, PORTMUX_MMCI_4BIT, PORTMUX_DRIVE_LOW); #endif return 0; @@ -82,9 +82,10 @@ 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] = 0x01; + return 0; } #if defined(CONFIG_MACB) && defined(CONFIG_CMD_NET) |