net: stmmac: thead: avoid conflicts with PHY_INTF_* definitions

Avoid conflicts between stmmac PHY_INTF_* and GMAC_INTF_CTRL register
definitions by replacing the PHY_ prefix with GMAC_.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Link: https://patch.msgid.link/E1vl36A-00000006urf-19ox@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-thead.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-thead.c
index e291028ba56e818196dde2ebe239a8e4d2d3710e..0d46a6c3f077e8115312c7911b4a3d43c190edd7 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-thead.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-thead.c
@@ -37,9 +37,9 @@
 #define GMAC_GTXCLK_SEL                        0x18
 #define  GMAC_GTXCLK_SEL_PLL           BIT(0)
 #define GMAC_INTF_CTRL                 0x1c
-#define  PHY_INTF_MASK                 BIT(0)
-#define  PHY_INTF_RGMII                        FIELD_PREP(PHY_INTF_MASK, 1)
-#define  PHY_INTF_MII_GMII             FIELD_PREP(PHY_INTF_MASK, 0)
+#define  GMAC_INTF_MASK                        BIT(0)
+#define  GMAC_INTF_RGMII               FIELD_PREP(GMAC_INTF_MASK, 1)
+#define  GMAC_INTF_MII_GMII            FIELD_PREP(GMAC_INTF_MASK, 0)
 #define GMAC_TXCLK_OEN                 0x20
 #define  TXCLK_DIR_MASK                        BIT(0)
 #define  TXCLK_DIR_OUTPUT              FIELD_PREP(TXCLK_DIR_MASK, 0)
@@ -58,13 +58,13 @@ static int thead_dwmac_set_phy_if(struct plat_stmmacenet_data *plat)
 
        switch (plat->phy_interface) {
        case PHY_INTERFACE_MODE_MII:
-               phyif = PHY_INTF_MII_GMII;
+               phyif = GMAC_INTF_MII_GMII;
                break;
        case PHY_INTERFACE_MODE_RGMII:
        case PHY_INTERFACE_MODE_RGMII_ID:
        case PHY_INTERFACE_MODE_RGMII_TXID:
        case PHY_INTERFACE_MODE_RGMII_RXID:
-               phyif = PHY_INTF_RGMII;
+               phyif = GMAC_INTF_RGMII;
                break;
        default:
                dev_err(dwmac->dev, "unsupported phy interface %s\n",