Commit 608975d4 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: stmmac: ingenic: simplify mac_set_mode() methods 



x1000, x1600 and x1830 only accept RMII mode. PHY_INTF_SEL_RMII is only
selected with PHY_INTERFACE_MODE_RMII, and PHY_INTF_SEL_RMII has been
validated by the SoC's .valid_phy_intf_sel bitmask. Thus, checking the
interface mode in these functions becomes unnecessary. Remove these.

jz4775 is similar, except for a greater set of PHY_INTF_SEL_x valies.
Also remove the switch statement here.

Reviewed-by: default avatarMaxime Chevallier <maxime.chevallier@bootlin.com>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1vHHqI-0000000DjrV-3ygL@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 35147b5c

drivers/net/ethernet/stmicro/stmmac/dwmac-ingenic.c

+2 −48
Original line number Diff line number Diff line
@@ -75,22 +75,6 @@ static int jz4775_mac_set_mode(struct plat_stmmacenet_data *plat_dat, 
	struct ingenic_mac *mac = plat_dat->bsp_priv;

	unsigned int val;



	switch (plat_dat->phy_interface) {

	case PHY_INTERFACE_MODE_MII:

	case PHY_INTERFACE_MODE_GMII:

	case PHY_INTERFACE_MODE_RMII:

	case PHY_INTERFACE_MODE_RGMII:

	case PHY_INTERFACE_MODE_RGMII_ID:

	case PHY_INTERFACE_MODE_RGMII_TXID:

	case PHY_INTERFACE_MODE_RGMII_RXID:

		break;



	default:

		dev_err(mac->dev, "Unsupported interface %s\n",

			phy_modes(plat_dat->phy_interface));

		return -EINVAL;

	}



	val = FIELD_PREP(MACPHYC_PHY_INFT_MASK, phy_intf_sel) |

	      FIELD_PREP(MACPHYC_TXCLK_SEL_MASK, MACPHYC_TXCLK_SEL_INPUT);
@@ -103,16 +87,6 @@ static int x1000_mac_set_mode(struct plat_stmmacenet_data *plat_dat, 
{

	struct ingenic_mac *mac = plat_dat->bsp_priv;



	switch (plat_dat->phy_interface) {

	case PHY_INTERFACE_MODE_RMII:

		break;



	default:

		dev_err(mac->dev, "Unsupported interface %s\n",

			phy_modes(plat_dat->phy_interface));

		return -EINVAL;

	}



	/* Update MAC PHY control register */

	return regmap_update_bits(mac->regmap, 0, mac->soc_info->mask, 0);

}
@@ -123,16 +97,6 @@ static int x1600_mac_set_mode(struct plat_stmmacenet_data *plat_dat, 
	struct ingenic_mac *mac = plat_dat->bsp_priv;

	unsigned int val;



	switch (plat_dat->phy_interface) {

	case PHY_INTERFACE_MODE_RMII:

		break;



	default:

		dev_err(mac->dev, "Unsupported interface %s\n",

			phy_modes(plat_dat->phy_interface));

		return -EINVAL;

	}



	val = FIELD_PREP(MACPHYC_PHY_INFT_MASK, phy_intf_sel);



	/* Update MAC PHY control register */
@@ -145,18 +109,8 @@ static int x1830_mac_set_mode(struct plat_stmmacenet_data *plat_dat, 
	struct ingenic_mac *mac = plat_dat->bsp_priv;

	unsigned int val;



	switch (plat_dat->phy_interface) {

	case PHY_INTERFACE_MODE_RMII:

		val = FIELD_PREP(MACPHYC_MODE_SEL_MASK, MACPHYC_MODE_SEL_RMII);

		break;



	default:

		dev_err(mac->dev, "Unsupported interface %s\n",

			phy_modes(plat_dat->phy_interface));

		return -EINVAL;

	}



	val |= FIELD_PREP(MACPHYC_PHY_INFT_MASK, phy_intf_sel);

	val = FIELD_PREP(MACPHYC_MODE_SEL_MASK, MACPHYC_MODE_SEL_RMII) |

	      FIELD_PREP(MACPHYC_PHY_INFT_MASK, phy_intf_sel);



	/* Update MAC PHY control register */

	return regmap_update_bits(mac->regmap, 0, mac->soc_info->mask, val);