KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ramips: ramips_esw: add helper function to set VLAN id

Browse source 
SVN-Revision: 24337
This commit is contained in:
Gabor Juhos 2010-12-08 10:15:22 +00:00
parent 0d2ad7a816
commit f7c3f91074
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
target/linux/ramips/files/drivers/net/ramips_esw.c
View file

@ -28,6 +28,9 @@
#define RT305X_ESW_PHY_TIMEOUT (5 * HZ) #define RT305X_ESW_PHY_TIMEOUT (5 * HZ)
#define RT305X_ESW_VLANI_VID_M 0xfff
#define RT305X_ESW_VLANI_VID_S 12
struct rt305x_esw { struct rt305x_esw {
void __iomem *base; void __iomem *base;
struct rt305x_esw_platform_data *pdata; struct rt305x_esw_platform_data *pdata;
@ -108,6 +111,18 @@ out:
return ret; return ret;
} }
static void
rt305x_esw_set_vlan_id(struct rt305x_esw *esw, unsigned vlan, unsigned vid)
{
unsigned s;
s = RT305X_ESW_VLANI_VID_S * (vlan % 2);
rt305x_esw_rmw(esw,
RT305X_ESW_REG_VLANI(vlan / 2),
RT305X_ESW_VLANI_VID_M << s,
(vid & RT305X_ESW_VLANI_VID_M) << s);
}
static void static void
rt305x_esw_hw_init(struct rt305x_esw *esw) rt305x_esw_hw_init(struct rt305x_esw *esw)
{ {
@ -117,7 +132,6 @@ rt305x_esw_hw_init(struct rt305x_esw *esw)
rt305x_esw_wr(esw, 0xC8A07850, RT305X_ESW_REG_FCT0); rt305x_esw_wr(esw, 0xC8A07850, RT305X_ESW_REG_FCT0);
rt305x_esw_wr(esw, 0x00000000, RT305X_ESW_REG_SGC2); rt305x_esw_wr(esw, 0x00000000, RT305X_ESW_REG_SGC2);
rt305x_esw_wr(esw, 0x00405555, RT305X_ESW_REG_PFC1); rt305x_esw_wr(esw, 0x00405555, RT305X_ESW_REG_PFC1);
rt305x_esw_wr(esw, 0x00002001, RT305X_ESW_REG_VLANI(0));
rt305x_esw_wr(esw, 0x00007f7f, RT305X_ESW_REG_POC1); rt305x_esw_wr(esw, 0x00007f7f, RT305X_ESW_REG_POC1);
rt305x_esw_wr(esw, 0x00007f3f, RT305X_ESW_REG_POC3); rt305x_esw_wr(esw, 0x00007f3f, RT305X_ESW_REG_POC3);
rt305x_esw_wr(esw, 0x00d6500c, RT305X_ESW_REG_FCT2); rt305x_esw_wr(esw, 0x00d6500c, RT305X_ESW_REG_FCT2);
@ -154,7 +168,8 @@ rt305x_esw_hw_init(struct rt305x_esw *esw)
rt305x_mii_write(esw, 0, 31, 0x8000); rt305x_mii_write(esw, 0, 31, 0x8000);
/* set default vlan */ /* set default vlan */
rt305x_esw_wr(esw, 0x2001, RT305X_ESW_REG_VLANI(0)); rt305x_esw_set_vlan_id(esw, 0, 1);
rt305x_esw_set_vlan_id(esw, 1, 2);
rt305x_esw_wr(esw, 0x504f, RT305X_ESW_REG_VMSC(0)); rt305x_esw_wr(esw, 0x504f, RT305X_ESW_REG_VMSC(0));
} }