diff options
| author | Tom Rini <trini@konsulko.com> | 2017-11-10 10:04:21 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-11-10 10:04:21 -0500 |
| commit | 66bd5a3ebb9fc6837194069f521c0705fb9d1b5e (patch) | |
| tree | f6d522094258cb4465b21bf53c9fcdbe48bbe68c | |
| parent | 60567a320f4a55f05ae94fbb34f7aac0dd4c8fea (diff) | |
| parent | 8e2c2d413c37b7fd13641730b706774c08982f0f (diff) | |
Merge git://git.denx.de/u-boot-sunxi
| -rw-r--r-- | board/sunxi/board.c | 2 | ||||
| -rw-r--r-- | drivers/net/sun8i_emac.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 6e13ee32c14..dcacdf3e626 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -217,6 +217,8 @@ int board_init(void) satapwr_pin = sunxi_name_to_gpio(CONFIG_SATAPWR); gpio_request(satapwr_pin, "satapwr"); gpio_direction_output(satapwr_pin, 1); + /* Give attached sata device time to power-up to avoid link timeouts */ + mdelay(500); #endif #ifdef CONFIG_MACPWR macpwr_pin = sunxi_name_to_gpio(CONFIG_MACPWR); diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c index 09bbb2cdb5c..3ccc6b0bb61 100644 --- a/drivers/net/sun8i_emac.c +++ b/drivers/net/sun8i_emac.c @@ -604,6 +604,8 @@ static void sun8i_emac_board_setup(struct emac_eth_dev *priv) { struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE; +#ifdef CONFIG_MACH_SUNXI_H3_H5 + /* Only H3/H5 have clock controls for internal EPHY */ if (priv->use_internal_phy) { /* Set clock gating for ephy */ setbits_le32(&ccm->bus_gate4, BIT(AHB_GATE_OFFSET_EPHY)); @@ -611,6 +613,7 @@ static void sun8i_emac_board_setup(struct emac_eth_dev *priv) /* Deassert EPHY */ setbits_le32(&ccm->ahb_reset2_cfg, BIT(AHB_RESET_OFFSET_EPHY)); } +#endif /* Set clock gating for emac */ setbits_le32(&ccm->ahb_gate0, BIT(AHB_GATE_OFFSET_GMAC)); |