net: stmmac: stm32: use PHY_INTF_SEL_x directly

Rather than defining separate constants for each, use the
PHY_INTF_SEL_x definitions in the switch()es configuring the
control register, and use one FIELD_PREP() to convert phy_intf_sel
to the register value.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1vIjUP-0000000Dqtt-1bYn@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
index 1545772419d552a7cb28e7fb6b05b988da84d556..18d26f096f5f763616cc95da2cccd9ac98921cea 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
@@ -48,30 +48,17 @@
  */
 #define SYSCFG_PMCR_ETH_SEL_MII                BIT(20)
 #define SYSCFG_PMCR_PHY_INTF_SEL_MASK  GENMASK(23, 21)
-#define SYSCFG_PMCR_ETH_SEL_RGMII      \
-       FIELD_PREP(SYSCFG_PMCR_PHY_INTF_SEL_MASK, PHY_INTF_SEL_RGMII)
-#define SYSCFG_PMCR_ETH_SEL_RMII       \
-       FIELD_PREP(SYSCFG_PMCR_PHY_INTF_SEL_MASK, PHY_INTF_SEL_RMII)
-#define SYSCFG_PMCR_ETH_SEL_GMII       \
-       FIELD_PREP(SYSCFG_PMCR_PHY_INTF_SEL_MASK, PHY_INTF_SEL_GMII_MII)
 #define SYSCFG_MCU_ETH_SEL_MII         0
 #define SYSCFG_MCU_ETH_SEL_RMII                1
 
 /* STM32MP2 register definitions */
 #define SYSCFG_MP2_ETH_MASK            GENMASK(31, 0)
 
+#define SYSCFG_ETHCR_ETH_SEL_MASK      GENMASK(6, 4)
 #define SYSCFG_ETHCR_ETH_PTP_CLK_SEL   BIT(2)
 #define SYSCFG_ETHCR_ETH_CLK_SEL       BIT(1)
 #define SYSCFG_ETHCR_ETH_REF_CLK_SEL   BIT(0)
 
-#define SYSCFG_ETHCR_ETH_SEL_MASK      GENMASK(6, 4)
-#define SYSCFG_ETHCR_ETH_SEL_MII       FIELD_PREP(SYSCFG_ETHCR_ETH_SEL_MASK, \
-                                                  PHY_INTF_SEL_GMII_MII)
-#define SYSCFG_ETHCR_ETH_SEL_RGMII     FIELD_PREP(SYSCFG_ETHCR_ETH_SEL_MASK, \
-                                                  PHY_INTF_SEL_RGMII)
-#define SYSCFG_ETHCR_ETH_SEL_RMII      FIELD_PREP(SYSCFG_ETHCR_ETH_SEL_MASK, \
-                                                  PHY_INTF_SEL_RMII)
-
 /* STM32MPx register definitions
  *
  * Below table summarizes the clock requirement and clock sources for
@@ -244,10 +231,12 @@ static int stm32mp1_configure_pmcr(struct plat_stmmacenet_data *plat_dat)
 {
        struct stm32_dwmac *dwmac = plat_dat->bsp_priv;
        u32 reg = dwmac->mode_reg;
+       u8 phy_intf_sel;
        int val = 0;
 
        switch (plat_dat->phy_interface) {
        case PHY_INTERFACE_MODE_MII:
+               phy_intf_sel = PHY_INTF_SEL_GMII_MII;
                /*
                 * STM32MP15xx supports both MII and GMII, STM32MP13xx MII only.
                 * SYSCFG_PMCSETR ETH_SELMII is present only on STM32MP15xx and
@@ -258,12 +247,12 @@ static int stm32mp1_configure_pmcr(struct plat_stmmacenet_data *plat_dat)
                        val |= SYSCFG_PMCR_ETH_SEL_MII;
                break;
        case PHY_INTERFACE_MODE_GMII:
-               val = SYSCFG_PMCR_ETH_SEL_GMII;
+               phy_intf_sel = PHY_INTF_SEL_GMII_MII;
                if (dwmac->enable_eth_ck)
                        val |= SYSCFG_PMCR_ETH_CLK_SEL;
                break;
        case PHY_INTERFACE_MODE_RMII:
-               val = SYSCFG_PMCR_ETH_SEL_RMII;
+               phy_intf_sel = PHY_INTF_SEL_RMII;
                if (dwmac->enable_eth_ck)
                        val |= SYSCFG_PMCR_ETH_REF_CLK_SEL;
                break;
@@ -271,7 +260,7 @@ static int stm32mp1_configure_pmcr(struct plat_stmmacenet_data *plat_dat)
        case PHY_INTERFACE_MODE_RGMII_ID:
        case PHY_INTERFACE_MODE_RGMII_RXID:
        case PHY_INTERFACE_MODE_RGMII_TXID:
-               val = SYSCFG_PMCR_ETH_SEL_RGMII;
+               phy_intf_sel = PHY_INTF_SEL_RGMII;
                if (dwmac->enable_eth_ck)
                        val |= SYSCFG_PMCR_ETH_CLK_SEL;
                break;
@@ -284,6 +273,8 @@ static int stm32mp1_configure_pmcr(struct plat_stmmacenet_data *plat_dat)
 
        dev_dbg(dwmac->dev, "Mode %s", phy_modes(plat_dat->phy_interface));
 
+       val |= FIELD_PREP(SYSCFG_PMCR_PHY_INTF_SEL_MASK, phy_intf_sel);
+
        /* Shift value at correct ethernet MAC offset in SYSCFG_PMCSETR */
        val <<= ffs(dwmac->mode_mask) - ffs(SYSCFG_MP1_ETH_MASK);
 
@@ -299,6 +290,7 @@ static int stm32mp1_configure_pmcr(struct plat_stmmacenet_data *plat_dat)
 static int stm32mp2_configure_syscfg(struct plat_stmmacenet_data *plat_dat)
 {
        struct stm32_dwmac *dwmac = plat_dat->bsp_priv;
+       u8 phy_intf_sel = PHY_INTF_SEL_GMII_MII;
        u32 reg = dwmac->mode_reg;
        int val = 0;
 
@@ -307,7 +299,7 @@ static int stm32mp2_configure_syscfg(struct plat_stmmacenet_data *plat_dat)
                /* ETH_REF_CLK_SEL bit in SYSCFG register is not applicable in MII mode */
                break;
        case PHY_INTERFACE_MODE_RMII:
-               val = SYSCFG_ETHCR_ETH_SEL_RMII;
+               phy_intf_sel = PHY_INTF_SEL_RMII;
                if (dwmac->enable_eth_ck) {
                        /* Internal clock ETH_CLK of 50MHz from RCC is used */
                        val |= SYSCFG_ETHCR_ETH_REF_CLK_SEL;
@@ -317,7 +309,7 @@ static int stm32mp2_configure_syscfg(struct plat_stmmacenet_data *plat_dat)
        case PHY_INTERFACE_MODE_RGMII_ID:
        case PHY_INTERFACE_MODE_RGMII_RXID:
        case PHY_INTERFACE_MODE_RGMII_TXID:
-               val = SYSCFG_ETHCR_ETH_SEL_RGMII;
+               phy_intf_sel = PHY_INTF_SEL_RGMII;
                fallthrough;
        case PHY_INTERFACE_MODE_GMII:
                if (dwmac->enable_eth_ck) {
@@ -334,6 +326,8 @@ static int stm32mp2_configure_syscfg(struct plat_stmmacenet_data *plat_dat)
 
        dev_dbg(dwmac->dev, "Mode %s", phy_modes(plat_dat->phy_interface));
 
+       val |= FIELD_PREP(SYSCFG_ETHCR_ETH_SEL_MASK, phy_intf_sel);
+
        /* Select PTP (IEEE1588) clock selection from RCC (ck_ker_ethxptp) */
        val |= SYSCFG_ETHCR_ETH_PTP_CLK_SEL;