[PATCH net-next v2 06/13] net: stmmac: mediatek: simplify set_interface() methods

[Maxime Chevallier]

On 11/11/2025 09:12, Russell King (Oracle) wrote:
> Use the phy_intf_sel field value when deciding what other options to
> apply for the configuration register.
> 
> Note that this will allow GMII as well as MII as the phy_intf_sel
> value is the same for both.
> 
> Signed-off-by: Russell King (Oracle) <rmk+kernel at armlinux.org.uk>

Reviewed-by: Maxime Chevallier <maxime.chevallier at bootlin.com>

Maxime

> ---
>  .../ethernet/stmicro/stmmac/dwmac-mediatek.c  | 50 +++++--------------
>  1 file changed, 12 insertions(+), 38 deletions(-)
> 
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c
> index 0f32732efb75..1f2d7d19ca56 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c
> @@ -110,26 +110,13 @@ static const char * const mt8195_dwmac_clk_l[] = {
>  static int mt2712_set_interface(struct mediatek_dwmac_plat_data *plat,
>  				u8 phy_intf_sel)
>  {
> -	int rmii_clk_from_mac = plat->rmii_clk_from_mac ? RMII_CLK_SRC_INTERNAL : 0;
> -	int rmii_rxc = plat->rmii_rxc ? RMII_CLK_SRC_RXC : 0;
> -	u32 intf_val;
> +	u32 intf_val = phy_intf_sel;
>  
> -	intf_val = phy_intf_sel;
> -
> -	/* select phy interface in top control domain */
> -	switch (plat->phy_mode) {
> -	case PHY_INTERFACE_MODE_RMII:
> -		intf_val |= rmii_rxc | rmii_clk_from_mac;
> -		break;
> -	case PHY_INTERFACE_MODE_MII:
> -	case PHY_INTERFACE_MODE_RGMII:
> -	case PHY_INTERFACE_MODE_RGMII_TXID:
> -	case PHY_INTERFACE_MODE_RGMII_RXID:
> -	case PHY_INTERFACE_MODE_RGMII_ID:
> -		break;
> -	default:
> -		dev_err(plat->dev, "phy interface not supported\n");
> -		return -EINVAL;
> +	if (phy_intf_sel == PHY_INTF_SEL_RMII) {
> +		if (plat->rmii_clk_from_mac)
> +			intf_val |= RMII_CLK_SRC_INTERNAL;
> +		if (plat->rmii_rxc)
> +			intf_val |= RMII_CLK_SRC_RXC;
>  	}
>  
>  	regmap_write(plat->peri_regmap, PERI_ETH_PHY_INTF_SEL, intf_val);
> @@ -289,26 +276,13 @@ static const struct mediatek_dwmac_variant mt2712_gmac_variant = {
>  static int mt8195_set_interface(struct mediatek_dwmac_plat_data *plat,
>  				u8 phy_intf_sel)
>  {
> -	int rmii_clk_from_mac = plat->rmii_clk_from_mac ? MT8195_RMII_CLK_SRC_INTERNAL : 0;
> -	int rmii_rxc = plat->rmii_rxc ? MT8195_RMII_CLK_SRC_RXC : 0;
> -	u32 intf_val;
> +	u32 intf_val = FIELD_PREP(MT8195_ETH_INTF_SEL, phy_intf_sel);
>  
> -	intf_val = FIELD_PREP(MT8195_ETH_INTF_SEL, phy_intf_sel);
> -
> -	/* select phy interface in top control domain */
> -	switch (plat->phy_mode) {
> -	case PHY_INTERFACE_MODE_RMII:
> -		intf_val |= rmii_rxc | rmii_clk_from_mac;
> -		break;
> -	case PHY_INTERFACE_MODE_MII:
> -	case PHY_INTERFACE_MODE_RGMII:
> -	case PHY_INTERFACE_MODE_RGMII_TXID:
> -	case PHY_INTERFACE_MODE_RGMII_RXID:
> -	case PHY_INTERFACE_MODE_RGMII_ID:
> -		break;
> -	default:
> -		dev_err(plat->dev, "phy interface not supported\n");
> -		return -EINVAL;
> +	if (phy_intf_sel == PHY_INTF_SEL_RMII) {
> +		if (plat->rmii_clk_from_mac)
> +			intf_val |= MT8195_RMII_CLK_SRC_INTERNAL;
> +		if (plat->rmii_rxc)
> +			intf_val |= MT8195_RMII_CLK_SRC_RXC;
>  	}
>  
>  	/* MT8195 only support external PHY */