From d8ee9c29d5e77d936f15df98ffc4855b02c5cea7 Mon Sep 17 00:00:00 2001 From: David Wu Date: Tue, 29 Oct 2019 22:20:24 +0800 Subject: [PATCH] net: ethernet: stmmac: dwmac-rk: Don't configure has_gmac for gmac5.10a The gmac5.10a configure has_gmac4 with true and has_gmac with false. Others still stay has_gmac with true. Change-Id: I0d0d1adef8551d2f7aac6702f963cb23a9861036 Signed-off-by: David Wu --- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c index 6a1158f9948e..70f1f8d3685c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -1624,7 +1624,9 @@ static int rk_gmac_probe(struct platform_device *pdev) if (IS_ERR(plat_dat)) return PTR_ERR(plat_dat); - plat_dat->has_gmac = true; + if (!of_device_is_compatible(pdev->dev.of_node, "snps,dwmac-4.20a")) + plat_dat->has_gmac = true; + plat_dat->fix_mac_speed = rk_fix_speed; plat_dat->get_eth_addr = rk_get_eth_addr;