Commit d6b06251 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by David S. Miller
Browse files

net: stmmac: Don't set has_gmac if has_gmac4 is set 



Some Rockchip platforms have a GMAC4 core, and therefore
'plat_stmmacenet_data.has_gmac' shouldn't be set if
'plat_stmmacenet_data.has_gmac4' is set.

Signed-off-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5796254e

drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c

+5 −1
Original line number Diff line number Diff line
@@ -1448,6 +1448,10 @@ static int rk_gmac_probe(struct platform_device *pdev) 
	if (IS_ERR(plat_dat))

		return PTR_ERR(plat_dat);



	/* If the stmmac is not already selected as gmac4,

	 * then make sure we fallback to gmac.

	 */

	if (!plat_dat->has_gmac4)

		plat_dat->has_gmac = true;

	plat_dat->fix_mac_speed = rk_fix_speed;