diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-03-23 10:41:46 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-03-23 10:41:46 +0100 |
| commit | 4ace2823bc1fcc96874069a9a8c0821ff4f95f5d (patch) | |
| tree | 12073fe32a64a2acf3c8e41ef5435526ae712651 /board/earthlcd/favr-32-ezkit/favr-32-ezkit.c | |
| parent | 181c3e46f81e5564cc43ab69adf450fb5b66eab4 (diff) | |
| parent | 1129b14e549c8629cbff8c19cb650cc431211868 (diff) | |
| download | u-boot-imx-4ace2823bc1fcc96874069a9a8c0821ff4f95f5d.zip u-boot-imx-4ace2823bc1fcc96874069a9a8c0821ff4f95f5d.tar.gz u-boot-imx-4ace2823bc1fcc96874069a9a8c0821ff4f95f5d.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-avr32
Diffstat (limited to 'board/earthlcd/favr-32-ezkit/favr-32-ezkit.c')
| -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) |