diff options
Diffstat (limited to 'target/linux/ramips/files/drivers/net/ramips_esw.c')
| -rw-r--r-- | target/linux/ramips/files/drivers/net/ramips_esw.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/target/linux/ramips/files/drivers/net/ramips_esw.c b/target/linux/ramips/files/drivers/net/ramips_esw.c index 027284b084..a2fa579d8b 100644 --- a/target/linux/ramips/files/drivers/net/ramips_esw.c +++ b/target/linux/ramips/files/drivers/net/ramips_esw.c @@ -218,7 +218,7 @@ rt305x_esw_hw_init(struct rt305x_esw *esw) (RT305X_ESW_PORTS_NOCPU << RT305X_ESW_POC3_UNTAG_EN_S)), RT305X_ESW_REG_POC3); - rt305x_esw_wr(esw, 0x00d6500c, RT305X_ESW_REG_FCT2); + rt305x_esw_wr(esw, esw->pdata->reg_initval_fct2, RT305X_ESW_REG_FCT2); rt305x_esw_wr(esw, 0x0008a301, RT305X_ESW_REG_SGC); /* Setup SoC Port control register */ @@ -229,7 +229,7 @@ rt305x_esw_hw_init(struct rt305x_esw *esw) (RT305X_ESW_PORTS_CPU << RT305X_ESW_SOCPC_DISBC2CPU_S)), RT305X_ESW_REG_SOCPC); - rt305x_esw_wr(esw, 0x3f502b28, RT305X_ESW_REG_FPA2); + rt305x_esw_wr(esw, esw->pdata->reg_initval_fpa2, RT305X_ESW_REG_FPA2); rt305x_esw_wr(esw, 0x00000000, RT305X_ESW_REG_FPA); /* Force Link/Activity on ports */ @@ -277,6 +277,18 @@ rt305x_esw_hw_init(struct rt305x_esw *esw) case RT305X_ESW_VLAN_CONFIG_NONE: break; + case RT305X_ESW_VLAN_CONFIG_BYPASS: + /* Pass all vlan tags to all ports */ + for (i = 0; i < RT305X_ESW_NUM_VLANS; i++) { + rt305x_esw_set_vlan_id(esw, i, i+1); + rt305x_esw_set_vmsc(esw, i, RT305X_ESW_PORTS_ALL); + } + /* Disable VLAN TAG removal, keep aging on. */ + rt305x_esw_wr(esw, + RT305X_ESW_PORTS_ALL << RT305X_ESW_POC3_ENAGING_S, + RT305X_ESW_REG_POC3); + break; + case RT305X_ESW_VLAN_CONFIG_LLLLW: rt305x_esw_set_vlan_id(esw, 0, 1); rt305x_esw_set_vlan_id(esw, 1, 2); |