drivers: net: xgene: Use rgmii mdio mac access

This patch switches to use rgmii mdio mac access routines if available,
as they share the same HW.

Signed-off-by: Quan Nguyen <qnguyen@apm.com>
Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
index 2050c58eddfd6f18cc5a45acb2d12c197812fd5f..47c5b754068dfe68527255b56cebb959b79723c5 100644 (file)
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
@@ -277,6 +277,13 @@ void xgene_enet_wr_mac(struct xgene_enet_pdata *pdata, u32 wr_addr, u32 wr_data)
        u8 wait = 10;
        u32 done;
 
+       if (pdata->mdio_driver && ndev->phydev &&
+           pdata->phy_mode == PHY_INTERFACE_MODE_RGMII) {
+               struct mii_bus *bus = ndev->phydev->mdio.bus;
+
+               return xgene_mdio_wr_mac(bus->priv, wr_addr, wr_data);
+       }
+
        addr = pdata->mcx_mac_addr + MAC_ADDR_REG_OFFSET;
        wr = pdata->mcx_mac_addr + MAC_WRITE_REG_OFFSET;
        cmd = pdata->mcx_mac_addr + MAC_COMMAND_REG_OFFSET;
@@ -328,6 +335,13 @@ u32 xgene_enet_rd_mac(struct xgene_enet_pdata *pdata, u32 rd_addr)
        u32 done, rd_data;
        u8 wait = 10;
 
+       if (pdata->mdio_driver && pdata->ndev->phydev &&
+           pdata->phy_mode == PHY_INTERFACE_MODE_RGMII) {
+               struct mii_bus *bus = pdata->ndev->phydev->mdio.bus;
+
+               return xgene_mdio_rd_mac(bus->priv, rd_addr);
+       }
+
        addr = pdata->mcx_mac_addr + MAC_ADDR_REG_OFFSET;
        rd = pdata->mcx_mac_addr + MAC_READ_REG_OFFSET;
        cmd = pdata->mcx_mac_addr + MAC_COMMAND_REG_OFFSET;