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

net: stmmac: lpc18xx: validate phy_intf_sel 



Validate the phy_intf_sel value rather than the PHY interface mode.
This will allow us to transition to the ->set_phy_intf_sel() method.
Note that this will allow GMII as well as MII as the phy_intf_sel
value is the same for both.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1vGy5P-0000000DhQJ-0Oi3@rmk-PC.armlinux.org.uk


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

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

+3 −4
Original line number Diff line number Diff line
@@ -47,14 +47,13 @@ static int lpc18xx_dwmac_probe(struct platform_device *pdev) 
		return PTR_ERR(reg);

	}



	if (plat_dat->phy_interface != PHY_INTERFACE_MODE_MII &&

	    plat_dat->phy_interface != PHY_INTERFACE_MODE_RMII) {

	ethmode = stmmac_get_phy_intf_sel(plat_dat->phy_interface);

	if (ethmode != PHY_INTF_SEL_GMII_MII &&

	    ethmode != PHY_INTF_SEL_RMII) {

		dev_err(&pdev->dev, "Only MII and RMII mode supported\n");

		return -EINVAL;

	}



	ethmode = stmmac_get_phy_intf_sel(plat_dat->phy_interface);



	regmap_update_bits(reg, LPC18XX_CREG_CREG6,

			   LPC18XX_CREG_CREG6_ETHMODE_MASK, ethmode);