bcmgenet: Add support for rgmii-rxid

The commit 57805f2270c4 ("net: bcmgenet: Don't set ID_MODE_DIS when
not using RGMII") needed to be extended for the case of using the
rgmii-rxid.  The latest version of the Rasbperry Pi4 dtb files for the
5.4 now specify the rgmii-rxid.

Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Tested-by: Petr Tesarik <ptesarik@suse.com>
Signed-off-by: Matthias Brugger <mbrugger@suse.com>

diff --git a/drivers/net/bcmgenet.c b/drivers/net/bcmgenet.c
index 1b7e7ba2bff66a788a8acd7142dea534bd077581..ace13313621b98354e8ff5119b225ee2eff665cf 100644 (file)
--- a/drivers/net/bcmgenet.c
+++ b/drivers/net/bcmgenet.c
@@ -457,7 +457,8 @@ static int bcmgenet_adjust_link(struct bcmgenet_eth_priv *priv)
        clrsetbits_32(priv->mac_reg + EXT_RGMII_OOB_CTRL, OOB_DISABLE,
                        RGMII_LINK | RGMII_MODE_EN);
 
-       if (phy_dev->interface == PHY_INTERFACE_MODE_RGMII)
+       if (phy_dev->interface == PHY_INTERFACE_MODE_RGMII ||
+           phy_dev->interface == PHY_INTERFACE_MODE_RGMII_RXID)
                setbits_32(priv->mac_reg + EXT_RGMII_OOB_CTRL, ID_MODE_DIS);
 
        writel(speed << CMD_SPEED_SHIFT, (priv->mac_reg + UMAC_CMD));