summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-03-14 13:27:14 -0400
committerTom Rini <trini@konsulko.com>2018-03-14 13:27:14 -0400
commitb75643ad0a2429e7efc7317517b47203c3c2f7c9 (patch)
treeb502e94a80977a8ddeee441da37211a3b5d955a1 /drivers/net
parent218da804ef0971ecee8063c45deae0345e344812 (diff)
parent341c05865478e259c1c9d889c74c43dcd5192cc0 (diff)
Merge git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/phy/Kconfig7
-rw-r--r--drivers/net/sun8i_emac.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 7fd4a8d261..25de3fb226 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -13,6 +13,13 @@ menuconfig PHYLIB
if PHYLIB
+config PHY_ADDR
+ int "PHY address"
+ default 1 if ARCH_SUNXI
+ default 0
+ help
+ The address of PHY on MII bus. Usually in range of 0 to 31.
+
config B53_SWITCH
bool "Broadcom BCM53xx (RoboSwitch) Ethernet switch PHY support."
help
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c
index 3ccc6b0bb6..be43472b1a 100644
--- a/drivers/net/sun8i_emac.c
+++ b/drivers/net/sun8i_emac.c
@@ -431,7 +431,7 @@ static int _sun8i_emac_eth_init(struct emac_eth_dev *priv, u8 *enetaddr)
tx_descs_init(priv);
/* PHY Start Up */
- genphy_parse_link(priv->phydev);
+ phy_startup(priv->phydev);
sun8i_adjust_link(priv, priv->phydev);