Commit 3a87131e authored by Arınç ÜNAL's avatar Arınç ÜNAL Committed by Paolo Abeni
Browse files

net: dsa: mt7530: put initialising PCS devices code back to original order



The commit fae46308 ("net: dsa: mt753x: fix pcs conversion regression")
fixes regression caused by cpu_port_config manually calling phylink
operations. cpu_port_config was deemed useless and was removed. Therefore,
put initialising PCS devices code back to its original order.

Signed-off-by: default avatarArınç ÜNAL <arinc.unal@arinc9.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 1192ed89
Loading
Loading
Loading
Loading
+10 −10
Original line number Diff line number Diff line
@@ -2812,17 +2812,9 @@ static int
mt753x_setup(struct dsa_switch *ds)
{
	struct mt7530_priv *priv = ds->priv;
	int i, ret;

	/* Initialise the PCS devices */
	for (i = 0; i < priv->ds->num_ports; i++) {
		priv->pcs[i].pcs.ops = priv->info->pcs_ops;
		priv->pcs[i].pcs.neg_mode = true;
		priv->pcs[i].priv = priv;
		priv->pcs[i].port = i;
	}
	int ret = priv->info->sw_setup(ds);
	int i;

	ret = priv->info->sw_setup(ds);
	if (ret)
		return ret;

@@ -2834,6 +2826,14 @@ mt753x_setup(struct dsa_switch *ds)
	if (ret && priv->irq)
		mt7530_free_irq_common(priv);

	/* Initialise the PCS devices */
	for (i = 0; i < priv->ds->num_ports; i++) {
		priv->pcs[i].pcs.ops = priv->info->pcs_ops;
		priv->pcs[i].pcs.neg_mode = true;
		priv->pcs[i].priv = priv;
		priv->pcs[i].port = i;
	}

	if (priv->create_sgmii) {
		ret = priv->create_sgmii(priv);
		if (ret && priv->irq)