diff options
Diffstat (limited to 'board/miromico/hammerhead/hammerhead.c')
| -rw-r--r-- | board/miromico/hammerhead/hammerhead.c | 26 | 
1 files changed, 11 insertions, 15 deletions
| diff --git a/board/miromico/hammerhead/hammerhead.c b/board/miromico/hammerhead/hammerhead.c index d3875f449..8b3e22cd9 100644 --- a/board/miromico/hammerhead/hammerhead.c +++ b/board/miromico/hammerhead/hammerhead.c @@ -22,17 +22,15 @@   * MA 02111-1307 USA   */ -#include "../cpu/at32ap/at32ap700x/sm.h" -  #include <common.h>  #include <netdev.h>  #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/memory-map.h> +#include <asm/arch/portmux.h>  DECLARE_GLOBAL_DATA_PTR; @@ -64,14 +62,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(32, 23, 0, PORTMUX_DRIVE_HIGH); +	portmux_enable_usart1(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;  } @@ -96,18 +94,16 @@ 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;  } -void gclk_init(void) +int board_postclk_init(void)  {  	/* Hammerhead boards uses GCLK3 as 25MHz output to ethernet PHY */ - -	/* Select GCLK3 peripheral function */ -	gpio_select_periph_A(GPIO_PIN_PB29, 0); - -	/* Enable GCLK3 with no input divider, from OSC0 (crystal) */ -	sm_writel(PM_GCCTRL(3), SM_BIT(CEN)); +	gclk_enable_output(3, PORTMUX_DRIVE_LOW); +	gclk_set_rate(3, GCLK_PARENT_OSC0, 25000000); +	return 0;  } |