diff options
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/fm/memac.c | 4 | ||||
| -rw-r--r-- | drivers/net/ldpaa_eth/ldpaa_eth.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/fm/memac.c b/drivers/net/fm/memac.c index 1b5779cece..ea50ed38f4 100644 --- a/drivers/net/fm/memac.c +++ b/drivers/net/fm/memac.c @@ -84,6 +84,7 @@ static void memac_set_interface_mode(struct fsl_enet_mac *mac, if_mode |= IF_MODE_GMII; break; case PHY_INTERFACE_MODE_RGMII: + case PHY_INTERFACE_MODE_RGMII_TXID: if_mode |= (IF_MODE_GMII | IF_MODE_RG); break; case PHY_INTERFACE_MODE_RMII: @@ -106,7 +107,8 @@ static void memac_set_interface_mode(struct fsl_enet_mac *mac, if (type != PHY_INTERFACE_MODE_XGMII) if_mode |= IF_MODE_EN_AUTO; - if (type == PHY_INTERFACE_MODE_RGMII) { + if (type == PHY_INTERFACE_MODE_RGMII || + type == PHY_INTERFACE_MODE_RGMII_TXID) { if_mode &= ~IF_MODE_EN_AUTO; if_mode &= ~IF_MODE_SETSP_MASK; switch (speed) { diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c index 4e61700d5d..f235b622b6 100644 --- a/drivers/net/ldpaa_eth/ldpaa_eth.c +++ b/drivers/net/ldpaa_eth/ldpaa_eth.c @@ -587,8 +587,10 @@ static void ldpaa_eth_stop(struct eth_device *net_dev) #ifdef CONFIG_PHYLIB if (priv->phydev && bus != NULL) phy_shutdown(priv->phydev); - else + else { free(priv->phydev); + priv->phydev = NULL; + } #endif ldpaa_dpbp_free(); |