Skip to content

Commit 0027340

Browse files
Biao Huangdavem330
Biao Huang
authored andcommitted
net: ethernet: mtk-star-emac: add support for MII interface
Add support for MII interface. If user wants to use MII, assign "MII" to "phy-mode" property in dts. Signed-off-by: Biao Huang <[email protected]> Signed-off-by: Yinghua Pan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 320c49f commit 0027340

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

drivers/net/ethernet/mediatek/mtk_star_emac.c

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ static const char *const mtk_star_clk_names[] = { "core", "reg", "trans" };
192192
#define MTK_PERICFG_REG_NIC_CFG1_CON 0x03c8
193193
#define MTK_PERICFG_REG_NIC_CFG_CON_V2 0x0c10
194194
#define MTK_PERICFG_REG_NIC_CFG_CON_CFG_INTF GENMASK(3, 0)
195+
#define MTK_PERICFG_BIT_NIC_CFG_CON_MII 0
195196
#define MTK_PERICFG_BIT_NIC_CFG_CON_RMII 1
196197
#define MTK_PERICFG_BIT_NIC_CFG_CON_CLK BIT(0)
197198
#define MTK_PERICFG_BIT_NIC_CFG_CON_CLK_V2 BIT(8)
@@ -1462,6 +1463,7 @@ static int mtk_star_set_timing(struct mtk_star_priv *priv)
14621463
unsigned int delay_val = 0;
14631464

14641465
switch (priv->phy_intf) {
1466+
case PHY_INTERFACE_MODE_MII:
14651467
case PHY_INTERFACE_MODE_RMII:
14661468
delay_val |= FIELD_PREP(MTK_STAR_BIT_INV_RX_CLK, priv->rx_inv);
14671469
delay_val |= FIELD_PREP(MTK_STAR_BIT_INV_TX_CLK, priv->tx_inv);
@@ -1543,7 +1545,8 @@ static int mtk_star_probe(struct platform_device *pdev)
15431545
ret = of_get_phy_mode(of_node, &priv->phy_intf);
15441546
if (ret) {
15451547
return ret;
1546-
} else if (priv->phy_intf != PHY_INTERFACE_MODE_RMII) {
1548+
} else if (priv->phy_intf != PHY_INTERFACE_MODE_RMII &&
1549+
priv->phy_intf != PHY_INTERFACE_MODE_MII) {
15471550
dev_err(dev, "unsupported phy mode: %s\n",
15481551
phy_modes(priv->phy_intf));
15491552
return -EINVAL;
@@ -1612,6 +1615,10 @@ static int mt8516_set_interface_mode(struct net_device *ndev)
16121615
unsigned int intf_val, ret, rmii_rxc;
16131616

16141617
switch (priv->phy_intf) {
1618+
case PHY_INTERFACE_MODE_MII:
1619+
intf_val = MTK_PERICFG_BIT_NIC_CFG_CON_MII;
1620+
rmii_rxc = 0;
1621+
break;
16151622
case PHY_INTERFACE_MODE_RMII:
16161623
intf_val = MTK_PERICFG_BIT_NIC_CFG_CON_RMII;
16171624
rmii_rxc = priv->rmii_rxc ? 0 : MTK_PERICFG_BIT_NIC_CFG_CON_CLK;
@@ -1641,6 +1648,9 @@ static int mt8365_set_interface_mode(struct net_device *ndev)
16411648
unsigned int intf_val;
16421649

16431650
switch (priv->phy_intf) {
1651+
case PHY_INTERFACE_MODE_MII:
1652+
intf_val = MTK_PERICFG_BIT_NIC_CFG_CON_MII;
1653+
break;
16441654
case PHY_INTERFACE_MODE_RMII:
16451655
intf_val = MTK_PERICFG_BIT_NIC_CFG_CON_RMII;
16461656
intf_val |= priv->rmii_rxc ? 0 : MTK_PERICFG_BIT_NIC_CFG_CON_CLK_V2;

0 commit comments

Comments
 (0)