Merge "ipq806x: Reset all PHYs and wait for settling down"

This commit is contained in:
Linux Build Service Account 2019-06-27 10:05:28 -07:00 committed by Gerrit - the friendly Code Review server
commit 7f71df2b22

View file

@ -725,7 +725,7 @@ int ipq_gmac_init(ipq_gmac_board_cfg_t *gmac_cfg)
uchar *mac_addr;
char ethaddr[32] = "ethaddr";
char mac[64];
int i;
int i, phy_idx;
int ret;
int gmac_gpio_node = 0, ar8033_gpio_node = 0, offset = 0;
memset(enet_addr, 0, sizeof(enet_addr));
@ -867,9 +867,12 @@ int ipq_gmac_init(ipq_gmac_board_cfg_t *gmac_cfg)
strncpy(bb_miiphy_buses[i].name, gmac_cfg->phy_name,
sizeof(bb_miiphy_buses[i].name));
miiphy_register(bb_miiphy_buses[i].name, bb_miiphy_read, bb_miiphy_write);
miiphy_write(bb_miiphy_buses[i].name,
(uintptr_t)ipq_gmac_macs[i]->phy_address, PHY_CONTROL_REG,
BMCR_RESET | AUTO_NEG_ENABLE);
for (phy_idx = 0; phy_idx < ipq_gmac_macs[i]->no_of_phys; phy_idx++) {
miiphy_write(bb_miiphy_buses[i].name,
ipq_gmac_macs[i]->phy_address[phy_idx], PHY_CONTROL_REG,
BMCR_RESET | AUTO_NEG_ENABLE);
mdelay(100);
}
}
eth_register(dev[i]);