2016-07-04 13:20:25 +00:00
|
|
|
--- a/drivers/net/ethernet/mediatek/mt7530.c
|
|
|
|
|
+++ b/drivers/net/ethernet/mediatek/mt7530.c
|
2016-07-13 10:07:08 +00:00
|
|
|
@@ -539,6 +539,7 @@ mt7530_apply_config(struct switch_dev *d
|
2016-07-04 13:20:25 +00:00
|
|
|
u8 etags = priv->vlan_entries[i].etags;
|
|
|
|
|
u32 val;
|
|
|
|
|
|
|
|
|
|
+#ifndef CONFIG_SOC_MT7621
|
|
|
|
|
/* vid of vlan */
|
|
|
|
|
val = mt7530_r32(priv, REG_ESW_VLAN_VTIM(i));
|
|
|
|
|
if (i % 2 == 0) {
|
2016-07-13 10:07:08 +00:00
|
|
|
@@ -549,7 +550,7 @@ mt7530_apply_config(struct switch_dev *d
|
2016-07-04 13:20:25 +00:00
|
|
|
val |= (vid << 12);
|
|
|
|
|
}
|
|
|
|
|
mt7530_w32(priv, REG_ESW_VLAN_VTIM(i), val);
|
|
|
|
|
-
|
|
|
|
|
+#endif
|
|
|
|
|
/* vlan port membership */
|
|
|
|
|
if (member)
|
|
|
|
|
mt7530_w32(priv, REG_ESW_VLAN_VAWD1, REG_ESW_VLAN_VAWD1_IVL_MAC |
|
2016-07-13 10:07:08 +00:00
|
|
|
@@ -569,7 +570,11 @@ mt7530_apply_config(struct switch_dev *d
|
2016-07-04 13:20:25 +00:00
|
|
|
mt7530_w32(priv, REG_ESW_VLAN_VAWD2, val);
|
|
|
|
|
|
|
|
|
|
/* write to vlan table */
|
|
|
|
|
+#ifdef CONFIG_SOC_MT7621
|
|
|
|
|
+ mt7530_vtcr(priv, 1, vid);
|
|
|
|
|
+#else
|
|
|
|
|
mt7530_vtcr(priv, 1, i);
|
|
|
|
|
+#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Port Default PVID */
|
