All Qualcomm platforms have only supported EMAC version 4 until now whereas in future we will also be supporting XGMAC version which has higher capabilities than its peer. As both has_gmac4 and has_xgmac fields cannot co-exist, make sure to disable the former flag when has_xgmac is enabled. We want to keep the default capabilities as EMAC4 and enable XGMAC support from the dtsi based on the platform needs. Signed-off-by: Sagar Cheluvegowda <quic_scheluve@xxxxxxxxxxx> --- drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c index 901a3c1959fa..2f813f7ab196 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c @@ -872,6 +872,8 @@ static int qcom_ethqos_probe(struct platform_device *pdev) plat_dat->dump_debug_regs = rgmii_dump; plat_dat->ptp_clk_freq_config = ethqos_ptp_clk_freq_config; plat_dat->has_gmac4 = 1; + if (plat_dat->has_xgmac) + plat_dat->has_gmac4 = 0; if (ethqos->has_emac_ge_3) plat_dat->dwmac4_addrs = &data->dwmac4_addrs; plat_dat->pmt = 1; --- base-commit: 28955f4fa2823e39f1ecfb3a37a364563527afbc change-id: 20241112-fix_qcom_ethqos_to_support_xgmac-d1a81ea9cbfc Best regards, -- Sagar Cheluvegowda <quic_scheluve@xxxxxxxxxxx>
