ramips: ramips_esw: add helper function to set pvid

SVN-Revision: 24339

diff --git a/target/linux/ramips/files/drivers/net/ramips_esw.c b/target/linux/ramips/files/drivers/net/ramips_esw.c
index c422032..7aa5fd1 100644 (file)
--- a/target/linux/ramips/files/drivers/net/ramips_esw.c
+++ b/target/linux/ramips/files/drivers/net/ramips_esw.c
@@ -28,6 +28,9 @@
 
 #define RT305X_ESW_PHY_TIMEOUT         (5 * HZ)
 
 
 #define RT305X_ESW_PHY_TIMEOUT         (5 * HZ)
 

+#define RT305X_ESW_PVIDC_PVID_M                0xfff
+#define RT305X_ESW_PVIDC_PVID_S                12
+

 #define RT305X_ESW_VLANI_VID_M         0xfff
 #define RT305X_ESW_VLANI_VID_S         12
 
 #define RT305X_ESW_VLANI_VID_M         0xfff
 #define RT305X_ESW_VLANI_VID_S         12
 


@@ -134,6 +137,18 @@ rt305x_esw_set_vlan_id(struct rt305x_esw *esw, unsigned vlan, unsigned vid)
                       (vid & RT305X_ESW_VLANI_VID_M) << s);
 }
 
                       (vid & RT305X_ESW_VLANI_VID_M) << s);
 }
 

+static void
+rt305x_esw_set_pvid(struct rt305x_esw *esw, unsigned port, unsigned pvid)
+{
+       unsigned s;
+
+       s = RT305X_ESW_PVIDC_PVID_S * (port % 2);
+       rt305x_esw_rmw(esw,
+                      RT305X_ESW_REG_PVIDC(port / 2),
+                      RT305X_ESW_PVIDC_PVID_S << s,
+                      (pvid & RT305X_ESW_PVIDC_PVID_M) << s);
+}
+

 static void
 rt305x_esw_set_vmsc(struct rt305x_esw *esw, unsigned vlan, unsigned msc)
 {
 static void
 rt305x_esw_set_vmsc(struct rt305x_esw *esw, unsigned vlan, unsigned msc)
 {


@@ -160,7 +175,8 @@ rt305x_esw_hw_init(struct rt305x_esw *esw)
        rt305x_esw_wr(esw, 0x00d6500c, RT305X_ESW_REG_FCT2);
        rt305x_esw_wr(esw, 0x0008a301, RT305X_ESW_REG_SGC);
        rt305x_esw_wr(esw, 0x02404040, RT305X_ESW_REG_SOCPC);
        rt305x_esw_wr(esw, 0x00d6500c, RT305X_ESW_REG_FCT2);
        rt305x_esw_wr(esw, 0x0008a301, RT305X_ESW_REG_SGC);
        rt305x_esw_wr(esw, 0x02404040, RT305X_ESW_REG_SOCPC);

-       rt305x_esw_wr(esw, 0x00001002, RT305X_ESW_REG_PVIDC(2));
+       rt305x_esw_set_pvid(esw, RT305X_ESW_PORT4, 2);
+       rt305x_esw_set_pvid(esw, RT305X_ESW_PORT5, 1);

        rt305x_esw_wr(esw, 0x3f502b28, RT305X_ESW_REG_FPA2);
        rt305x_esw_wr(esw, 0x00000000, RT305X_ESW_REG_FPA);
 
        rt305x_esw_wr(esw, 0x3f502b28, RT305X_ESW_REG_FPA2);
        rt305x_esw_wr(esw, 0x00000000, RT305X_ESW_REG_FPA);