Commit 23c9ff65 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'net-stmmac-remove-unnecessary-of_get_phy_mode-calls' 

Russell King says:

====================
net: stmmac: remove unnecessary of_get_phy_mode() calls

This series removes unnecessary of_get_phy_mode() calls from the stmmac
glue drivers. stmmac_probe_config_dt() / devm_stmmac_probe_config_dt()
already gets the interface mode using device_get_phy_mode() and stores
it in plat_dat->phy_interface.

Therefore, glue drivers using of_get_phy_mode() are just duplicating
the work that has already been done.

This series adjusts the glue drivers to remove their usage of
of_get_phy_mode().
====================

Link: https://patch.msgid.link/Z9FQjQZb0IMaQJ9H@shell.armlinux.org.uk


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 15492700 00d2c3c0

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

+9 −12
Original line number Diff line number Diff line
@@ -59,10 +59,11 @@ static void anarion_gmac_exit(struct platform_device *pdev, void *priv) 
	gmac_write_reg(gmac, GMAC_RESET_CONTROL_REG, 1);

}



static struct anarion_gmac *anarion_config_dt(struct platform_device *pdev)

static struct anarion_gmac *

anarion_config_dt(struct platform_device *pdev,

		  struct plat_stmmacenet_data *plat_dat)

{

	struct anarion_gmac *gmac;

	phy_interface_t phy_mode;

	void __iomem *ctl_block;

	int err;
@@ -79,11 +80,7 @@ static struct anarion_gmac *anarion_config_dt(struct platform_device *pdev) 


	gmac->ctl_block = ctl_block;



	err = of_get_phy_mode(pdev->dev.of_node, &phy_mode);

	if (err)

		return ERR_PTR(err);



	switch (phy_mode) {

	switch (plat_dat->phy_interface) {

	case PHY_INTERFACE_MODE_RGMII:

		fallthrough;

	case PHY_INTERFACE_MODE_RGMII_ID:
@@ -93,7 +90,7 @@ static struct anarion_gmac *anarion_config_dt(struct platform_device *pdev) 
		break;

	default:

		dev_err(&pdev->dev, "Unsupported phy-mode (%d)\n",

			phy_mode);

			plat_dat->phy_interface);

		return ERR_PTR(-ENOTSUPP);

	}
@@ -111,14 +108,14 @@ static int anarion_dwmac_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	gmac = anarion_config_dt(pdev);

	if (IS_ERR(gmac))

		return PTR_ERR(gmac);



	plat_dat = devm_stmmac_probe_config_dt(pdev, stmmac_res.mac);

	if (IS_ERR(plat_dat))

		return PTR_ERR(plat_dat);



	gmac = anarion_config_dt(pdev, plat_dat);

	if (IS_ERR(gmac))

		return PTR_ERR(gmac);



	plat_dat->init = anarion_gmac_init;

	plat_dat->exit = anarion_gmac_exit;

	anarion_gmac_init(pdev, gmac);

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

+4 −8
Original line number Diff line number Diff line
@@ -211,16 +211,12 @@ static int ipq806x_gmac_set_speed(struct ipq806x_gmac *gmac, int speed) 
	return 0;

}



static int ipq806x_gmac_of_parse(struct ipq806x_gmac *gmac)

static int ipq806x_gmac_of_parse(struct ipq806x_gmac *gmac,

				 struct plat_stmmacenet_data *plat_dat)

{

	struct device *dev = &gmac->pdev->dev;

	int ret;



	ret = of_get_phy_mode(dev->of_node, &gmac->phy_mode);

	if (ret) {

		dev_err(dev, "missing phy mode property\n");

		return -EINVAL;

	}

	gmac->phy_mode = plat_dat->phy_interface;



	if (of_property_read_u32(dev->of_node, "qcom,id", &gmac->id) < 0) {

		dev_err(dev, "missing qcom id property\n");
@@ -398,7 +394,7 @@ static int ipq806x_gmac_probe(struct platform_device *pdev) 


	gmac->pdev = pdev;



	err = ipq806x_gmac_of_parse(gmac);

	err = ipq806x_gmac_of_parse(gmac, plat_dat);

	if (err) {

		dev_err(dev, "device tree parsing error\n");

		return err;

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;

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

+1 −5
Original line number Diff line number Diff line
@@ -417,11 +417,7 @@ static int meson8b_dwmac_probe(struct platform_device *pdev) 
		return PTR_ERR(dwmac->regs);



	dwmac->dev = &pdev->dev;

	ret = of_get_phy_mode(pdev->dev.of_node, &dwmac->phy_mode);

	if (ret) {

		dev_err(&pdev->dev, "missing phy-mode property\n");

		return ret;

	}

	dwmac->phy_mode = plat_dat->phy_interface;



	/* use 2ns as fallback since this value was previously hardcoded */

	if (of_property_read_u32(pdev->dev.of_node, "amlogic,tx-delay-ns",

drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c

+1 −3
Original line number Diff line number Diff line
@@ -794,9 +794,7 @@ static int qcom_ethqos_probe(struct platform_device *pdev) 
	if (!ethqos)

		return -ENOMEM;



	ret = of_get_phy_mode(np, &ethqos->phy_mode);

	if (ret)

		return dev_err_probe(dev, ret, "Failed to get phy mode\n");

	ethqos->phy_mode = plat_dat->phy_interface;

	switch (ethqos->phy_mode) {

	case PHY_INTERFACE_MODE_RGMII:

	case PHY_INTERFACE_MODE_RGMII_ID: