shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

net: stmmac: dwmac-rk: read mac address from devinfo first

Browse Source 
Change-Id: I2888dcfc57c2e5a266fdf1058f9ab70e04034f22
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
This commit is contained in:
Zhangbin Tong
2017-05-02 18:46:32 +08:00
committed by Tao Huang
parent fa3b8e0c40
commit c2a7dbb9c7
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
View File

@@ -1388,12 +1388,20 @@ static void rk_fix_speed(void *priv, unsigned int speed)
}
}
void rk_get_eth_addr_vendor(void *priv, unsigned char *addr)
void __weak rk_devinfo_get_eth_mac(u8 *mac)
{
}
void rk_get_eth_addr(void *priv, unsigned char *addr)
{
int ret;
struct rk_priv_data *bsp_priv = priv;
struct device *dev = &bsp_priv->pdev->dev;
rk_devinfo_get_eth_mac(addr);
if (is_valid_ether_addr(addr))
goto out;
ret = rk_vendor_read(LAN_MAC_ID, addr, 6);
if (ret != 6 || is_zero_ether_addr(addr)) {
dev_err(dev, "%s: rk_vendor_read eth mac address failed (%d)",
@@ -1406,11 +1414,12 @@ void rk_get_eth_addr_vendor(void *priv, unsigned char *addr)
if (ret != 0)
dev_err(dev, "%s: rk_vendor_write eth mac address failed (%d)",
__func__, ret);
} else {
dev_err(dev, "%s: rk_vendor_read eth mac address: %02x:%02x:%02x:%02x:%02x:%02x",
__func__, addr[0], addr[1], addr[2],
addr[3], addr[4], addr[5]);
}
out:
dev_err(dev, "%s: mac address: %02x:%02x:%02x:%02x:%02x:%02x",
__func__, addr[0], addr[1], addr[2],
addr[3], addr[4], addr[5]);
}
static int rk_gmac_probe(struct platform_device *pdev)
@@ -1436,7 +1445,7 @@ static int rk_gmac_probe(struct platform_device *pdev)
plat_dat->has_gmac = true;
plat_dat->fix_mac_speed = rk_fix_speed;
plat_dat->get_eth_addr = rk_get_eth_addr_vendor;
plat_dat->get_eth_addr = rk_get_eth_addr;
plat_dat->bsp_priv = rk_gmac_setup(pdev, plat_dat, data);
if (IS_ERR(plat_dat->bsp_priv)) {