ramips: rename the spi driver

[openwrt/svn-archive/archive.git] / target / linux / ramips / files / drivers / net / ramips_esw.c

diff --git a/target/linux/ramips/files/drivers/net/ramips_esw.c b/target/linux/ramips/files/drivers/net/ramips_esw.c
index df567a7216467e6f8db21cd272c378b0642319ef..a2fa579d8b37d05d006633500a6e9ca185f76220 100644 (file)
--- a/target/linux/ramips/files/drivers/net/ramips_esw.c
+++ b/target/linux/ramips/files/drivers/net/ramips_esw.c
@@ -19,6 +19,11 @@
 #define RT305X_ESW_REG_FPA2            0xc8
 #define RT305X_ESW_REG_FCT2            0xcc
 #define RT305X_ESW_REG_SGC2            0xe4
+#define RT305X_ESW_REG_P0LED   0xa4
+#define RT305X_ESW_REG_P1LED   0xa8
+#define RT305X_ESW_REG_P2LED   0xac
+#define RT305X_ESW_REG_P3LED   0xb0
+#define RT305X_ESW_REG_P4LED   0xb4
 
 #define RT305X_ESW_PCR0_WT_NWAY_DATA_S 16
 #define RT305X_ESW_PCR0_WT_PHY_CMD     BIT(13)
@@ -72,6 +77,9 @@
 #define RT305X_ESW_PORTS_ALL   \
                (RT305X_ESW_PORTS_NOCPU | RT305X_ESW_PORTS_CPU)
 
+#define RT305X_ESW_NUM_VLANS   16
+#define RT305X_ESW_NUM_PORTS   7
+
 struct rt305x_esw {
        void __iomem *base;
        struct rt305x_esw_platform_data *pdata;
@@ -210,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 */
@@ -221,11 +229,16 @@ rt305x_esw_hw_init(struct rt305x_esw *esw)
                       (RT305X_ESW_PORTS_CPU << RT305X_ESW_SOCPC_DISBC2CPU_S)),
                      RT305X_ESW_REG_SOCPC);
 
-       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, esw->pdata->reg_initval_fpa2, RT305X_ESW_REG_FPA2);
        rt305x_esw_wr(esw, 0x00000000, RT305X_ESW_REG_FPA);
 
+       /* Force Link/Activity on ports */
+       rt305x_esw_wr(esw, 0x00000005, RT305X_ESW_REG_P0LED);
+       rt305x_esw_wr(esw, 0x00000005, RT305X_ESW_REG_P1LED);
+       rt305x_esw_wr(esw, 0x00000005, RT305X_ESW_REG_P2LED);
+       rt305x_esw_wr(esw, 0x00000005, RT305X_ESW_REG_P3LED);
+       rt305x_esw_wr(esw, 0x00000005, RT305X_ESW_REG_P4LED);
+
        rt305x_mii_write(esw, 0, 31, 0x8000);
        for (i = 0; i < 5; i++) {
                /* TX10 waveform coefficient */
@@ -252,17 +265,59 @@ rt305x_esw_hw_init(struct rt305x_esw *esw)
        /* select local register */
        rt305x_mii_write(esw, 0, 31, 0x8000);
 
-       /* set default vlan */
-       rt305x_esw_set_vlan_id(esw, 0, 1);
-       rt305x_esw_set_vlan_id(esw, 1, 2);
-       rt305x_esw_set_vmsc(esw, 0,
-                           (BIT(RT305X_ESW_PORT0) | BIT(RT305X_ESW_PORT1) |
-                            BIT(RT305X_ESW_PORT2) | BIT(RT305X_ESW_PORT3) |
-                            BIT(RT305X_ESW_PORT6)));
-       rt305x_esw_set_vmsc(esw, 1,
-                           (BIT(RT305X_ESW_PORT4) | BIT(RT305X_ESW_PORT6)));
-       rt305x_esw_set_vmsc(esw, 2, 0);
-       rt305x_esw_set_vmsc(esw, 3, 0);
+       for (i = 0; i < RT305X_ESW_NUM_VLANS; i++) {
+               rt305x_esw_set_vlan_id(esw, i, 0);
+               rt305x_esw_set_vmsc(esw, i, 0);
+       }
+
+       for (i = 0; i < RT305X_ESW_NUM_PORTS; i++)
+               rt305x_esw_set_pvid(esw, i, 1);
+
+       switch (esw->pdata->vlan_config) {
+       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);
+               rt305x_esw_set_pvid(esw, RT305X_ESW_PORT4, 2);
+
+               rt305x_esw_set_vmsc(esw, 0,
+                               BIT(RT305X_ESW_PORT0) | BIT(RT305X_ESW_PORT1) |
+                               BIT(RT305X_ESW_PORT2) | BIT(RT305X_ESW_PORT3) |
+                               BIT(RT305X_ESW_PORT6));
+               rt305x_esw_set_vmsc(esw, 1,
+                               BIT(RT305X_ESW_PORT4) | BIT(RT305X_ESW_PORT6));
+               break;
+
+       case RT305X_ESW_VLAN_CONFIG_WLLLL:
+               rt305x_esw_set_vlan_id(esw, 0, 1);
+               rt305x_esw_set_vlan_id(esw, 1, 2);
+               rt305x_esw_set_pvid(esw, RT305X_ESW_PORT0, 2);
+
+               rt305x_esw_set_vmsc(esw, 0,
+                               BIT(RT305X_ESW_PORT1) | BIT(RT305X_ESW_PORT2) |
+                               BIT(RT305X_ESW_PORT3) | BIT(RT305X_ESW_PORT4) |
+                               BIT(RT305X_ESW_PORT6));
+               rt305x_esw_set_vmsc(esw, 1,
+                               BIT(RT305X_ESW_PORT0) | BIT(RT305X_ESW_PORT6));
+               break;
+
+       default:
+               BUG();
+       }
 }
 
 static int
@@ -339,7 +394,7 @@ rt305x_esw_init(void)
        return platform_driver_register(&rt305x_esw_driver);
 }
 
-static void __exit
+static void
 rt305x_esw_exit(void)
 {
        platform_driver_unregister(&rt305x_esw_driver);