net: dsa: sja1105: fix sja1105_parse_rgmii_delays()

BugLink: https://bugs.launchpad.net/bugs/1855326
[ Upstream commit 9bca3a0a923fc3f0fb9e41391be1d0f291e86858 ]

This function was using configuration of port 0 in devicetree for all ports.
In case CPU port was not 0, the delay settings was ignored. This resulted not
working communication between CPU and the switch.

Fixes: f5b8631c293b ("net: dsa: sja1105: Error out if RGMII delays are requested in DT")
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c
index 7687ddcae1598eafaa4d7815c1a432618e048881..aa140662c7c203c1a98f78a30fe866c81f2c250b 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_main.c
+++ b/drivers/net/dsa/sja1105/sja1105_main.c
@@ -594,15 +594,15 @@ static int sja1105_parse_rgmii_delays(struct sja1105_private *priv,
        int i;
 
        for (i = 0; i < SJA1105_NUM_PORTS; i++) {
-               if (ports->role == XMII_MAC)
+               if (ports[i].role == XMII_MAC)
                        continue;
 
-               if (ports->phy_mode == PHY_INTERFACE_MODE_RGMII_RXID ||
-                   ports->phy_mode == PHY_INTERFACE_MODE_RGMII_ID)
+               if (ports[i].phy_mode == PHY_INTERFACE_MODE_RGMII_RXID ||
+                   ports[i].phy_mode == PHY_INTERFACE_MODE_RGMII_ID)
                        priv->rgmii_rx_delay[i] = true;
 
-               if (ports->phy_mode == PHY_INTERFACE_MODE_RGMII_TXID ||
-                   ports->phy_mode == PHY_INTERFACE_MODE_RGMII_ID)
+               if (ports[i].phy_mode == PHY_INTERFACE_MODE_RGMII_TXID ||
+                   ports[i].phy_mode == PHY_INTERFACE_MODE_RGMII_ID)
                        priv->rgmii_tx_delay[i] = true;
 
                if ((priv->rgmii_rx_delay[i] || priv->rgmii_tx_delay[i]) &&