Commit 46f84d70 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Paolo Abeni
Browse files

net: stmmac: mediatek: remove of_get_phy_mode() 



devm_stmmac_probe_config_dt() already gets the PHY mode from firmware,
which is stored in plat_dat->phy_interface. Therefore, we don't need to
get it in platform code.

Initialise priv_plat->phy_mode from plat->phy_interface
inmediatek_dwmac_common_data().

Reviewed-by: default avatarMichal Kubiak <michal.kubiak@intel.com>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1tsIGN-005uzZ-NG@rmk-PC.armlinux.org.uk


Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 8ee1c926

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

+1 −7
Original line number Diff line number Diff line
@@ -456,7 +456,6 @@ static int mediatek_dwmac_config_dt(struct mediatek_dwmac_plat_data *plat) 
{

	struct mac_delay_struct *mac_delay = &plat->mac_delay;

	u32 tx_delay_ps, rx_delay_ps;

	int err;



	plat->peri_regmap = syscon_regmap_lookup_by_phandle(plat->np, "mediatek,pericfg");

	if (IS_ERR(plat->peri_regmap)) {
@@ -464,12 +463,6 @@ static int mediatek_dwmac_config_dt(struct mediatek_dwmac_plat_data *plat) 
		return PTR_ERR(plat->peri_regmap);

	}



	err = of_get_phy_mode(plat->np, &plat->phy_mode);

	if (err) {

		dev_err(plat->dev, "not find phy-mode\n");

		return err;

	}



	if (!of_property_read_u32(plat->np, "mediatek,tx-delay-ps", &tx_delay_ps)) {

		if (tx_delay_ps < plat->variant->tx_delay_max) {

			mac_delay->tx_delay = tx_delay_ps;
@@ -587,6 +580,7 @@ static int mediatek_dwmac_common_data(struct platform_device *pdev, 
{

	int i;



	priv_plat->phy_mode = plat->phy_interface;

	plat->mac_interface = priv_plat->phy_mode;

	if (priv_plat->mac_wol)

		plat->flags &= ~STMMAC_FLAG_USE_PHY_WOL;