Commit 318c1944 authored by Arınç ÜNAL's avatar Arınç ÜNAL Committed by David S. Miller

net: dsa: mt7530: use priv->ds->num_ports instead of MT7530_NUM_PORTS

Use priv->ds->num_ports on all for loops which configure the switch
registers. In the future, the value of MT7530_NUM_PORTS will depend on
priv->id. Therefore, this change prepares the subdriver for a simpler
implementation.
Signed-off-by: default avatarArınç ÜNAL <arinc.unal@arinc9.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aa16e1fc
...@@ -1411,7 +1411,7 @@ mt7530_port_set_vlan_unaware(struct dsa_switch *ds, int port) ...@@ -1411,7 +1411,7 @@ mt7530_port_set_vlan_unaware(struct dsa_switch *ds, int port)
mt7530_rmw(priv, MT7530_PPBV1_P(port), G0_PORT_VID_MASK, mt7530_rmw(priv, MT7530_PPBV1_P(port), G0_PORT_VID_MASK,
G0_PORT_VID_DEF); G0_PORT_VID_DEF);
for (i = 0; i < MT7530_NUM_PORTS; i++) { for (i = 0; i < priv->ds->num_ports; i++) {
if (dsa_is_user_port(ds, i) && if (dsa_is_user_port(ds, i) &&
dsa_port_is_vlan_filtering(dsa_to_port(ds, i))) { dsa_port_is_vlan_filtering(dsa_to_port(ds, i))) {
all_user_ports_removed = false; all_user_ports_removed = false;
...@@ -2428,7 +2428,7 @@ mt7530_setup(struct dsa_switch *ds) ...@@ -2428,7 +2428,7 @@ mt7530_setup(struct dsa_switch *ds)
/* Enable and reset MIB counters */ /* Enable and reset MIB counters */
mt7530_mib_reset(ds); mt7530_mib_reset(ds);
for (i = 0; i < MT7530_NUM_PORTS; i++) { for (i = 0; i < priv->ds->num_ports; i++) {
/* Clear link settings and enable force mode to force link down /* Clear link settings and enable force mode to force link down
* on all ports until they're enabled later. * on all ports until they're enabled later.
*/ */
...@@ -2539,7 +2539,7 @@ mt7531_setup_common(struct dsa_switch *ds) ...@@ -2539,7 +2539,7 @@ mt7531_setup_common(struct dsa_switch *ds)
mt7530_clear(priv, MT753X_MFC, BC_FFP_MASK | UNM_FFP_MASK | mt7530_clear(priv, MT753X_MFC, BC_FFP_MASK | UNM_FFP_MASK |
UNU_FFP_MASK); UNU_FFP_MASK);
for (i = 0; i < MT7530_NUM_PORTS; i++) { for (i = 0; i < priv->ds->num_ports; i++) {
/* Clear link settings and enable force mode to force link down /* Clear link settings and enable force mode to force link down
* on all ports until they're enabled later. * on all ports until they're enabled later.
*/ */
...@@ -2626,7 +2626,7 @@ mt7531_setup(struct dsa_switch *ds) ...@@ -2626,7 +2626,7 @@ mt7531_setup(struct dsa_switch *ds)
priv->p5_sgmii = !!(val & PAD_DUAL_SGMII_EN); priv->p5_sgmii = !!(val & PAD_DUAL_SGMII_EN);
/* Force link down on all ports before internal reset */ /* Force link down on all ports before internal reset */
for (i = 0; i < MT7530_NUM_PORTS; i++) for (i = 0; i < priv->ds->num_ports; i++)
mt7530_write(priv, MT753X_PMCR_P(i), MT7531_FORCE_MODE_LNK); mt7530_write(priv, MT753X_PMCR_P(i), MT7531_FORCE_MODE_LNK);
/* Reset the switch through internal reset */ /* Reset the switch through internal reset */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment