ar71xx: reclaim the 'user_property' partition on WHR-* boards
[openwrt.git] / target / linux / generic / files / drivers / net / phy / rtl8366s.c
index da8fe55..7f9680a 100644 (file)
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/skbuff.h>
-#include <linux/switch.h>
-#include <linux/rtl8366s.h>
+#include <linux/rtl8366.h>
 
 #include "rtl8366_smi.h"
 
-#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
-#include <linux/debugfs.h>
-#endif
-
 #define RTL8366S_DRIVER_DESC   "Realtek RTL8366S ethernet switch driver"
 #define RTL8366S_DRIVER_VER    "0.2.2"
 
-#define RTL8366S_PHY_NO_MAX                 4
-#define RTL8366S_PHY_PAGE_MAX               7
-#define RTL8366S_PHY_ADDR_MAX               31
-
-#define RTL8366_CHIP_GLOBAL_CTRL_REG        0x0000
-#define RTL8366_CHIP_CTRL_VLAN              (1 << 13)
+#define RTL8366S_PHY_NO_MAX    4
+#define RTL8366S_PHY_PAGE_MAX  7
+#define RTL8366S_PHY_ADDR_MAX  31
 
 /* Switch Global Configuration register */
-#define RTL8366_SGCR                   0x0000
-#define RTL8366_SGCR_EN_BC_STORM_CTRL  BIT(0)
-#define RTL8366_SGCR_MAX_LENGTH(_x)    (_x << 4)
-#define RTL8366_SGCR_MAX_LENGTH_MASK   RTL8366_SGCR_MAX_LENGTH(0x3)
-#define RTL8366_SGCR_MAX_LENGTH_1522   RTL8366_SGCR_MAX_LENGTH(0x0)
-#define RTL8366_SGCR_MAX_LENGTH_1536   RTL8366_SGCR_MAX_LENGTH(0x1)
-#define RTL8366_SGCR_MAX_LENGTH_1552   RTL8366_SGCR_MAX_LENGTH(0x2)
-#define RTL8366_SGCR_MAX_LENGTH_16000  RTL8366_SGCR_MAX_LENGTH(0x3)
+#define RTL8366S_SGCR                          0x0000
+#define RTL8366S_SGCR_EN_BC_STORM_CTRL         BIT(0)
+#define RTL8366S_SGCR_MAX_LENGTH(_x)           (_x << 4)
+#define RTL8366S_SGCR_MAX_LENGTH_MASK          RTL8366S_SGCR_MAX_LENGTH(0x3)
+#define RTL8366S_SGCR_MAX_LENGTH_1522          RTL8366S_SGCR_MAX_LENGTH(0x0)
+#define RTL8366S_SGCR_MAX_LENGTH_1536          RTL8366S_SGCR_MAX_LENGTH(0x1)
+#define RTL8366S_SGCR_MAX_LENGTH_1552          RTL8366S_SGCR_MAX_LENGTH(0x2)
+#define RTL8366S_SGCR_MAX_LENGTH_16000         RTL8366S_SGCR_MAX_LENGTH(0x3)
+#define RTL8366S_SGCR_EN_VLAN                  BIT(13)
 
 /* Port Enable Control register */
-#define RTL8366_PECR                   0x0001
+#define RTL8366S_PECR                          0x0001
 
 /* Switch Security Control registers */
-#define RTL8366_SSCR0                  0x0002
-#define RTL8366_SSCR1                  0x0003
-#define RTL8366_SSCR2                  0x0004
-#define RTL8366_SSCR2_DROP_UNKNOWN_DA  BIT(0)
+#define RTL8366S_SSCR0                         0x0002
+#define RTL8366S_SSCR1                         0x0003
+#define RTL8366S_SSCR2                         0x0004
+#define RTL8366S_SSCR2_DROP_UNKNOWN_DA         BIT(0)
 
-#define RTL8366_RESET_CTRL_REG              0x0100
-#define RTL8366_CHIP_CTRL_RESET_HW          1
-#define RTL8366_CHIP_CTRL_RESET_SW          (1 << 1)
+#define RTL8366S_RESET_CTRL_REG                        0x0100
+#define RTL8366S_CHIP_CTRL_RESET_HW            1
+#define RTL8366S_CHIP_CTRL_RESET_SW            (1 << 1)
 
-#define RTL8366S_CHIP_VERSION_CTRL_REG      0x0104
-#define RTL8366S_CHIP_VERSION_MASK          0xf
-#define RTL8366S_CHIP_ID_REG                0x0105
-#define RTL8366S_CHIP_ID_8366               0x8366
+#define RTL8366S_CHIP_VERSION_CTRL_REG         0x0104
+#define RTL8366S_CHIP_VERSION_MASK             0xf
+#define RTL8366S_CHIP_ID_REG                   0x0105
+#define RTL8366S_CHIP_ID_8366                  0x8366
 
 /* PHY registers control */
-#define RTL8366S_PHY_ACCESS_CTRL_REG        0x8028
-#define RTL8366S_PHY_ACCESS_DATA_REG        0x8029
+#define RTL8366S_PHY_ACCESS_CTRL_REG           0x8028
+#define RTL8366S_PHY_ACCESS_DATA_REG           0x8029
 
-#define RTL8366S_PHY_CTRL_READ              1
-#define RTL8366S_PHY_CTRL_WRITE             0
+#define RTL8366S_PHY_CTRL_READ                 1
+#define RTL8366S_PHY_CTRL_WRITE                        0
 
-#define RTL8366S_PHY_REG_MASK               0x1f
-#define RTL8366S_PHY_PAGE_OFFSET            5
-#define RTL8366S_PHY_PAGE_MASK              (0x7 << 5)
-#define RTL8366S_PHY_NO_OFFSET              9
-#define RTL8366S_PHY_NO_MASK                (0x1f << 9)
+#define RTL8366S_PHY_REG_MASK                  0x1f
+#define RTL8366S_PHY_PAGE_OFFSET               5
+#define RTL8366S_PHY_PAGE_MASK                 (0x7 << 5)
+#define RTL8366S_PHY_NO_OFFSET                 9
+#define RTL8366S_PHY_NO_MASK                   (0x1f << 9)
 
 /* LED control registers */
-#define RTL8366_LED_BLINKRATE_REG           0x0420
-#define RTL8366_LED_BLINKRATE_BIT           0
-#define RTL8366_LED_BLINKRATE_MASK          0x0007
-
-#define RTL8366_LED_CTRL_REG                0x0421
-#define RTL8366_LED_0_1_CTRL_REG            0x0422
-#define RTL8366_LED_2_3_CTRL_REG            0x0423
-
-#define RTL8366S_MIB_COUNT                  33
-#define RTL8366S_GLOBAL_MIB_COUNT           1
-#define RTL8366S_MIB_COUNTER_PORT_OFFSET    0x0040
-#define RTL8366S_MIB_COUNTER_BASE           0x1000
-#define RTL8366S_MIB_COUNTER_PORT_OFFSET2   0x0008
-#define RTL8366S_MIB_COUNTER_BASE2          0x1180
-#define RTL8366S_MIB_CTRL_REG               0x11F0
-#define RTL8366S_MIB_CTRL_USER_MASK         0x01FF
-#define RTL8366S_MIB_CTRL_BUSY_MASK         0x0001
-#define RTL8366S_MIB_CTRL_RESET_MASK        0x0002
-
-#define RTL8366S_MIB_CTRL_GLOBAL_RESET_MASK 0x0004
-#define RTL8366S_MIB_CTRL_PORT_RESET_BIT    0x0003
-#define RTL8366S_MIB_CTRL_PORT_RESET_MASK   0x01FC
-
-
-#define RTL8366S_PORT_VLAN_CTRL_BASE        0x0058
+#define RTL8366S_LED_BLINKRATE_REG             0x0420
+#define RTL8366S_LED_BLINKRATE_BIT             0
+#define RTL8366S_LED_BLINKRATE_MASK            0x0007
+
+#define RTL8366S_LED_CTRL_REG                  0x0421
+#define RTL8366S_LED_0_1_CTRL_REG              0x0422
+#define RTL8366S_LED_2_3_CTRL_REG              0x0423
+
+#define RTL8366S_MIB_COUNT                     33
+#define RTL8366S_GLOBAL_MIB_COUNT              1
+#define RTL8366S_MIB_COUNTER_PORT_OFFSET       0x0040
+#define RTL8366S_MIB_COUNTER_BASE              0x1000
+#define RTL8366S_MIB_COUNTER_PORT_OFFSET2      0x0008
+#define RTL8366S_MIB_COUNTER_BASE2             0x1180
+#define RTL8366S_MIB_CTRL_REG                  0x11F0
+#define RTL8366S_MIB_CTRL_USER_MASK            0x01FF
+#define RTL8366S_MIB_CTRL_BUSY_MASK            0x0001
+#define RTL8366S_MIB_CTRL_RESET_MASK           0x0002
+
+#define RTL8366S_MIB_CTRL_GLOBAL_RESET_MASK    0x0004
+#define RTL8366S_MIB_CTRL_PORT_RESET_BIT       0x0003
+#define RTL8366S_MIB_CTRL_PORT_RESET_MASK      0x01FC
+
+
+#define RTL8366S_PORT_VLAN_CTRL_BASE           0x0058
 #define RTL8366S_PORT_VLAN_CTRL_REG(_p)  \
                (RTL8366S_PORT_VLAN_CTRL_BASE + (_p) / 4)
-#define RTL8366S_PORT_VLAN_CTRL_MASK       0xf
-#define RTL8366S_PORT_VLAN_CTRL_SHIFT(_p)   (4 * ((_p) % 4))
+#define RTL8366S_PORT_VLAN_CTRL_MASK           0xf
+#define RTL8366S_PORT_VLAN_CTRL_SHIFT(_p)      (4 * ((_p) % 4))
 
 
-#define RTL8366S_VLAN_TABLE_READ_BASE       0x018B
-#define RTL8366S_VLAN_TABLE_WRITE_BASE      0x0185
+#define RTL8366S_VLAN_TABLE_READ_BASE          0x018B
+#define RTL8366S_VLAN_TABLE_WRITE_BASE         0x0185
 
-#define RTL8366S_VLAN_TB_CTRL_REG           0x010F
+#define RTL8366S_VLAN_TB_CTRL_REG              0x010F
 
-#define RTL8366S_TABLE_ACCESS_CTRL_REG      0x0180
-#define RTL8366S_TABLE_VLAN_READ_CTRL       0x0E01
-#define RTL8366S_TABLE_VLAN_WRITE_CTRL      0x0F01
+#define RTL8366S_TABLE_ACCESS_CTRL_REG         0x0180
+#define RTL8366S_TABLE_VLAN_READ_CTRL          0x0E01
+#define RTL8366S_TABLE_VLAN_WRITE_CTRL         0x0F01
 
-#define RTL8366S_VLAN_MEMCONF_BASE          0x0016
+#define RTL8366S_VLAN_MC_BASE(_x)              (0x0016 + (_x) * 2)
 
+#define RTL8366S_VLAN_MEMBERINGRESS_REG                0x0379
 
-#define RTL8366S_PORT_LINK_STATUS_BASE      0x0060
-#define RTL8366S_PORT_STATUS_SPEED_MASK     0x0003
-#define RTL8366S_PORT_STATUS_DUPLEX_MASK    0x0004
-#define RTL8366S_PORT_STATUS_LINK_MASK      0x0010
-#define RTL8366S_PORT_STATUS_TXPAUSE_MASK   0x0020
-#define RTL8366S_PORT_STATUS_RXPAUSE_MASK   0x0040
-#define RTL8366S_PORT_STATUS_AN_MASK        0x0080
+#define RTL8366S_PORT_LINK_STATUS_BASE         0x0060
+#define RTL8366S_PORT_STATUS_SPEED_MASK                0x0003
+#define RTL8366S_PORT_STATUS_DUPLEX_MASK       0x0004
+#define RTL8366S_PORT_STATUS_LINK_MASK         0x0010
+#define RTL8366S_PORT_STATUS_TXPAUSE_MASK      0x0020
+#define RTL8366S_PORT_STATUS_RXPAUSE_MASK      0x0040
+#define RTL8366S_PORT_STATUS_AN_MASK           0x0080
 
 
-#define RTL8366_PORT_NUM_CPU                5
-#define RTL8366_NUM_PORTS                   6
-#define RTL8366_NUM_VLANS                   16
-#define RTL8366_NUM_LEDGROUPS               4
-#define RTL8366_NUM_VIDS                    4096
-#define RTL8366S_PRIORITYMAX                7
-#define RTL8366S_FIDMAX                            7
+#define RTL8366S_PORT_NUM_CPU          5
+#define RTL8366S_NUM_PORTS             6
+#define RTL8366S_NUM_VLANS             16
+#define RTL8366S_NUM_LEDGROUPS         4
+#define RTL8366S_NUM_VIDS              4096
+#define RTL8366S_PRIORITYMAX           7
+#define RTL8366S_FIDMAX                        7
 
 
-#define RTL8366_PORT_1                      (1 << 0) /* In userspace port 0 */
-#define RTL8366_PORT_2                      (1 << 1) /* In userspace port 1 */
-#define RTL8366_PORT_3                      (1 << 2) /* In userspace port 2 */
-#define RTL8366_PORT_4                      (1 << 3) /* In userspace port 3 */
+#define RTL8366S_PORT_1                        (1 << 0) /* In userspace port 0 */
+#define RTL8366S_PORT_2                        (1 << 1) /* In userspace port 1 */
+#define RTL8366S_PORT_3                        (1 << 2) /* In userspace port 2 */
+#define RTL8366S_PORT_4                        (1 << 3) /* In userspace port 3 */
 
-#define RTL8366_PORT_UNKNOWN                (1 << 4) /* No known connection */
-#define RTL8366_PORT_CPU                    (1 << 5) /* CPU port */
+#define RTL8366S_PORT_UNKNOWN          (1 << 4) /* No known connection */
+#define RTL8366S_PORT_CPU              (1 << 5) /* CPU port */
 
-#define RTL8366_PORT_ALL                    (RTL8366_PORT_1 |       \
-                                            RTL8366_PORT_2 |       \
-                                            RTL8366_PORT_3 |       \
-                                            RTL8366_PORT_4 |       \
-                                            RTL8366_PORT_UNKNOWN | \
-                                            RTL8366_PORT_CPU)
+#define RTL8366S_PORT_ALL              (RTL8366S_PORT_1 |      \
+                                        RTL8366S_PORT_2 |      \
+                                        RTL8366S_PORT_3 |      \
+                                        RTL8366S_PORT_4 |      \
+                                        RTL8366S_PORT_UNKNOWN | \
+                                        RTL8366S_PORT_CPU)
 
-#define RTL8366_PORT_ALL_BUT_CPU            (RTL8366_PORT_1 |       \
-                                            RTL8366_PORT_2 |       \
-                                            RTL8366_PORT_3 |       \
-                                            RTL8366_PORT_4 |       \
-                                            RTL8366_PORT_UNKNOWN)
+#define RTL8366S_PORT_ALL_BUT_CPU      (RTL8366S_PORT_1 |      \
+                                        RTL8366S_PORT_2 |      \
+                                        RTL8366S_PORT_3 |      \
+                                        RTL8366S_PORT_4 |      \
+                                        RTL8366S_PORT_UNKNOWN)
 
-#define RTL8366_PORT_ALL_EXTERNAL           (RTL8366_PORT_1 |       \
-                                            RTL8366_PORT_2 |       \
-                                            RTL8366_PORT_3 |       \
-                                            RTL8366_PORT_4)
+#define RTL8366S_PORT_ALL_EXTERNAL     (RTL8366S_PORT_1 |      \
+                                        RTL8366S_PORT_2 |      \
+                                        RTL8366S_PORT_3 |      \
+                                        RTL8366S_PORT_4)
 
-#define RTL8366_PORT_ALL_INTERNAL           (RTL8366_PORT_UNKNOWN | \
-                                            RTL8366_PORT_CPU)
-
-struct rtl8366s {
-       struct device           *parent;
-       struct rtl8366_smi      smi;
-       struct switch_dev       dev;
-       char                    buf[4096];
-#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
-       struct dentry           *debugfs_root;
-#endif
-};
-
-struct rtl8366s_vlan_mc {
-       u16     reserved2:1;
-       u16     priority:3;
-       u16     vid:12;
-
-       u16     reserved1:1;
-       u16     fid:3;
-       u16     untag:6;
-       u16     member:6;
-};
+#define RTL8366S_PORT_ALL_INTERNAL     (RTL8366S_PORT_UNKNOWN | \
+                                        RTL8366S_PORT_CPU)
 
-struct rtl8366s_vlan_4k {
-       u16     reserved1:4;
-       u16     vid:12;
+#define RTL8366S_VLAN_VID_MASK         0xfff
+#define RTL8366S_VLAN_PRIORITY_SHIFT   12
+#define RTL8366S_VLAN_PRIORITY_MASK    0x7
+#define RTL8366S_VLAN_MEMBER_MASK      0x3f
+#define RTL8366S_VLAN_UNTAG_SHIFT      6
+#define RTL8366S_VLAN_UNTAG_MASK       0x3f
+#define RTL8366S_VLAN_FID_SHIFT                12
+#define RTL8366S_VLAN_FID_MASK         0x7
 
-       u16     reserved2:1;
-       u16     fid:3;
-       u16     untag:6;
-       u16     member:6;
-};
-
-#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
-u16 g_dbg_reg;
-#endif
-
-struct mib_counter {
-       unsigned        base;
-       unsigned        offset;
-       unsigned        length;
-       const char      *name;
-};
-
-static struct mib_counter rtl8366s_mib_counters[RTL8366S_MIB_COUNT] = {
+static struct rtl8366_mib_counter rtl8366s_mib_counters[] = {
        { 0,  0, 4, "IfInOctets"                                },
        { 0,  4, 4, "EtherStatsOctets"                          },
        { 0,  8, 2, "EtherStatsUnderSizePkts"                   },
@@ -263,35 +224,19 @@ static struct mib_counter rtl8366s_mib_counters[RTL8366S_MIB_COUNT] = {
                        return err;                                     \
        } while (0)
 
-static inline struct rtl8366s *smi_to_rtl8366s(struct rtl8366_smi *smi)
-{
-       return container_of(smi, struct rtl8366s, smi);
-}
-
-static inline struct rtl8366s *sw_to_rtl8366s(struct switch_dev *sw)
-{
-       return container_of(sw, struct rtl8366s, dev);
-}
-
-static inline struct rtl8366_smi *sw_to_rtl8366_smi(struct switch_dev *sw)
-{
-       struct rtl8366s *rtl = sw_to_rtl8366s(sw);
-       return &rtl->smi;
-}
-
 static int rtl8366s_reset_chip(struct rtl8366_smi *smi)
 {
        int timeout = 10;
        u32 data;
 
-       rtl8366_smi_write_reg(smi, RTL8366_RESET_CTRL_REG,
-                             RTL8366_CHIP_CTRL_RESET_HW);
+       rtl8366_smi_write_reg_noack(smi, RTL8366S_RESET_CTRL_REG,
+                                   RTL8366S_CHIP_CTRL_RESET_HW);
        do {
                msleep(1);
-               if (rtl8366_smi_read_reg(smi, RTL8366_RESET_CTRL_REG, &data))
+               if (rtl8366_smi_read_reg(smi, RTL8366S_RESET_CTRL_REG, &data))
                        return -EIO;
 
-               if (!(data & RTL8366_CHIP_CTRL_RESET_HW))
+               if (!(data & RTL8366S_CHIP_CTRL_RESET_HW))
                        break;
        } while (--timeout);
 
@@ -305,23 +250,37 @@ static int rtl8366s_reset_chip(struct rtl8366_smi *smi)
 
 static int rtl8366s_hw_init(struct rtl8366_smi *smi)
 {
+       struct rtl8366_platform_data *pdata;
        int err;
 
+       pdata = smi->parent->platform_data;
+       if (pdata->num_initvals && pdata->initvals) {
+               unsigned i;
+
+               dev_info(smi->parent, "applying initvals\n");
+               for (i = 0; i < pdata->num_initvals; i++)
+                       REG_WR(smi, pdata->initvals[i].reg,
+                              pdata->initvals[i].val);
+       }
+
        /* set maximum packet length to 1536 bytes */
-       REG_RMW(smi, RTL8366_SGCR, RTL8366_SGCR_MAX_LENGTH_MASK,
-               RTL8366_SGCR_MAX_LENGTH_1536);
+       REG_RMW(smi, RTL8366S_SGCR, RTL8366S_SGCR_MAX_LENGTH_MASK,
+               RTL8366S_SGCR_MAX_LENGTH_1536);
 
-       /* enable all ports */
-       REG_WR(smi, RTL8366_PECR, 0);
+       /* enable learning for all ports */
+       REG_WR(smi, RTL8366S_SSCR0, 0);
 
-       /* disable learning for all ports */
-       REG_WR(smi, RTL8366_SSCR0, RTL8366_PORT_ALL);
+       /* enable auto ageing for all ports */
+       REG_WR(smi, RTL8366S_SSCR1, 0);
 
-       /* disable auto ageing for all ports */
-       REG_WR(smi, RTL8366_SSCR1, RTL8366_PORT_ALL);
+       /*
+        * discard VLAN tagged packets if the port is not a member of
+        * the VLAN with which the packets is associated.
+        */
+       REG_WR(smi, RTL8366S_VLAN_MEMBERINGRESS_REG, RTL8366S_PORT_ALL);
 
        /* don't drop packets whose DA has not been learned */
-       REG_RMW(smi, RTL8366_SSCR2, RTL8366_SSCR2_DROP_UNKNOWN_DA, 0);
+       REG_RMW(smi, RTL8366S_SSCR2, RTL8366S_SSCR2_DROP_UNKNOWN_DA, 0);
 
        return 0;
 }
@@ -400,7 +359,7 @@ static int rtl8366_get_mib_counter(struct rtl8366_smi *smi, int counter,
        u32 addr, data;
        u64 mibvalue;
 
-       if (port > RTL8366_NUM_PORTS || counter >= RTL8366S_MIB_COUNT)
+       if (port > RTL8366S_NUM_PORTS || counter >= RTL8366S_MIB_COUNT)
                return -EINVAL;
 
        switch (rtl8366s_mib_counters[counter].base) {
@@ -456,22 +415,18 @@ static int rtl8366_get_mib_counter(struct rtl8366_smi *smi, int counter,
 static int rtl8366s_get_vlan_4k(struct rtl8366_smi *smi, u32 vid,
                                struct rtl8366_vlan_4k *vlan4k)
 {
-       struct rtl8366s_vlan_4k vlan4k_priv;
+       u32 data[2];
        int err;
-       u32 data;
-       u16 *tableaddr;
+       int i;
 
        memset(vlan4k, '\0', sizeof(struct rtl8366_vlan_4k));
-       vlan4k_priv.vid = vid;
 
-       if (vid >= RTL8366_NUM_VIDS)
+       if (vid >= RTL8366S_NUM_VIDS)
                return -EINVAL;
 
-       tableaddr = (u16 *)&vlan4k_priv;
-
        /* write VID */
-       data = *tableaddr;
-       err = rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TABLE_WRITE_BASE, data);
+       err = rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TABLE_WRITE_BASE,
+                                   vid & RTL8366S_VLAN_VID_MASK);
        if (err)
                return err;
 
@@ -481,24 +436,20 @@ static int rtl8366s_get_vlan_4k(struct rtl8366_smi *smi, u32 vid,
        if (err)
                return err;
 
-       err = rtl8366_smi_read_reg(smi, RTL8366S_VLAN_TABLE_READ_BASE, &data);
-       if (err)
-               return err;
-
-       *tableaddr = data;
-       tableaddr++;
-
-       err = rtl8366_smi_read_reg(smi, RTL8366S_VLAN_TABLE_READ_BASE + 1,
-                                  &data);
-       if (err)
-               return err;
-
-       *tableaddr = data;
+       for (i = 0; i < 2; i++) {
+               err = rtl8366_smi_read_reg(smi,
+                                          RTL8366S_VLAN_TABLE_READ_BASE + i,
+                                          &data[i]);
+               if (err)
+                       return err;
+       }
 
        vlan4k->vid = vid;
-       vlan4k->untag = vlan4k_priv.untag;
-       vlan4k->member = vlan4k_priv.member;
-       vlan4k->fid = vlan4k_priv.fid;
+       vlan4k->untag = (data[1] >> RTL8366S_VLAN_UNTAG_SHIFT) &
+                       RTL8366S_VLAN_UNTAG_MASK;
+       vlan4k->member = data[1] & RTL8366S_VLAN_MEMBER_MASK;
+       vlan4k->fid = (data[1] >> RTL8366S_VLAN_FID_SHIFT) &
+                       RTL8366S_VLAN_FID_MASK;
 
        return 0;
 }
@@ -506,38 +457,30 @@ static int rtl8366s_get_vlan_4k(struct rtl8366_smi *smi, u32 vid,
 static int rtl8366s_set_vlan_4k(struct rtl8366_smi *smi,
                                const struct rtl8366_vlan_4k *vlan4k)
 {
-       struct rtl8366s_vlan_4k vlan4k_priv;
+       u32 data[2];
        int err;
-       u32 data;
-       u16 *tableaddr;
+       int i;
 
-       if (vlan4k->vid >= RTL8366_NUM_VIDS ||
-           vlan4k->member > RTL8366_PORT_ALL ||
-           vlan4k->untag > RTL8366_PORT_ALL ||
+       if (vlan4k->vid >= RTL8366S_NUM_VIDS ||
+           vlan4k->member > RTL8366S_VLAN_MEMBER_MASK ||
+           vlan4k->untag > RTL8366S_VLAN_UNTAG_MASK ||
            vlan4k->fid > RTL8366S_FIDMAX)
                return -EINVAL;
 
-       vlan4k_priv.vid = vlan4k->vid;
-       vlan4k_priv.untag = vlan4k->untag;
-       vlan4k_priv.member = vlan4k->member;
-       vlan4k_priv.fid = vlan4k->fid;
-
-       tableaddr = (u16 *)&vlan4k_priv;
-
-       data = *tableaddr;
-
-       err = rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TABLE_WRITE_BASE, data);
-       if (err)
-               return err;
-
-       tableaddr++;
-
-       data = *tableaddr;
-
-       err = rtl8366_smi_write_reg(smi, RTL8366S_VLAN_TABLE_WRITE_BASE + 1,
-                                   data);
-       if (err)
-               return err;
+       data[0] = vlan4k->vid & RTL8366S_VLAN_VID_MASK;
+       data[1] = (vlan4k->member & RTL8366S_VLAN_MEMBER_MASK) |
+                 ((vlan4k->untag & RTL8366S_VLAN_UNTAG_MASK) <<
+                       RTL8366S_VLAN_UNTAG_SHIFT) |
+                 ((vlan4k->fid & RTL8366S_VLAN_FID_MASK) <<
+                       RTL8366S_VLAN_FID_SHIFT);
+
+       for (i = 0; i < 2; i++) {
+               err = rtl8366_smi_write_reg(smi,
+                                           RTL8366S_VLAN_TABLE_WRITE_BASE + i,
+                                           data[i]);
+               if (err)
+                       return err;
+       }
 
        /* write table access control word */
        err = rtl8366_smi_write_reg(smi, RTL8366S_TABLE_ACCESS_CTRL_REG,
@@ -549,39 +492,31 @@ static int rtl8366s_set_vlan_4k(struct rtl8366_smi *smi,
 static int rtl8366s_get_vlan_mc(struct rtl8366_smi *smi, u32 index,
                                struct rtl8366_vlan_mc *vlanmc)
 {
-       struct rtl8366s_vlan_mc vlanmc_priv;
+       u32 data[2];
        int err;
-       u32 addr;
-       u32 data;
-       u16 *tableaddr;
+       int i;
 
        memset(vlanmc, '\0', sizeof(struct rtl8366_vlan_mc));
 
-       if (index >= RTL8366_NUM_VLANS)
+       if (index >= RTL8366S_NUM_VLANS)
                return -EINVAL;
 
-       tableaddr = (u16 *)&vlanmc_priv;
-
-       addr = RTL8366S_VLAN_MEMCONF_BASE + (index << 1);
-       err = rtl8366_smi_read_reg(smi, addr, &data);
-       if (err)
-               return err;
-
-       *tableaddr = data;
-       tableaddr++;
-
-       addr = RTL8366S_VLAN_MEMCONF_BASE + 1 + (index << 1);
-       err = rtl8366_smi_read_reg(smi, addr, &data);
-       if (err)
-               return err;
-
-       *tableaddr = data;
+       for (i = 0; i < 2; i++) {
+               err = rtl8366_smi_read_reg(smi,
+                                          RTL8366S_VLAN_MC_BASE(index) + i,
+                                          &data[i]);
+               if (err)
+                       return err;
+       }
 
-       vlanmc->vid = vlanmc_priv.vid;
-       vlanmc->priority = vlanmc_priv.priority;
-       vlanmc->untag = vlanmc_priv.untag;
-       vlanmc->member = vlanmc_priv.member;
-       vlanmc->fid = vlanmc_priv.fid;
+       vlanmc->vid = data[0] & RTL8366S_VLAN_VID_MASK;
+       vlanmc->priority = (data[0] >> RTL8366S_VLAN_PRIORITY_SHIFT) &
+                          RTL8366S_VLAN_PRIORITY_MASK;
+       vlanmc->untag = (data[1] >> RTL8366S_VLAN_UNTAG_SHIFT) &
+                       RTL8366S_VLAN_UNTAG_MASK;
+       vlanmc->member = data[1] & RTL8366S_VLAN_MEMBER_MASK;
+       vlanmc->fid = (data[1] >> RTL8366S_VLAN_FID_SHIFT) &
+                     RTL8366S_VLAN_FID_MASK;
 
        return 0;
 }
@@ -589,43 +524,34 @@ static int rtl8366s_get_vlan_mc(struct rtl8366_smi *smi, u32 index,
 static int rtl8366s_set_vlan_mc(struct rtl8366_smi *smi, u32 index,
                                const struct rtl8366_vlan_mc *vlanmc)
 {
-       struct rtl8366s_vlan_mc vlanmc_priv;
+       u32 data[2];
        int err;
-       u32 addr;
-       u32 data;
-       u16 *tableaddr;
+       int i;
 
-       if (index >= RTL8366_NUM_VLANS ||
-           vlanmc->vid >= RTL8366_NUM_VIDS ||
+       if (index >= RTL8366S_NUM_VLANS ||
+           vlanmc->vid >= RTL8366S_NUM_VIDS ||
            vlanmc->priority > RTL8366S_PRIORITYMAX ||
-           vlanmc->member > RTL8366_PORT_ALL ||
-           vlanmc->untag > RTL8366_PORT_ALL ||
+           vlanmc->member > RTL8366S_VLAN_MEMBER_MASK ||
+           vlanmc->untag > RTL8366S_VLAN_UNTAG_MASK ||
            vlanmc->fid > RTL8366S_FIDMAX)
                return -EINVAL;
 
-       vlanmc_priv.vid = vlanmc->vid;
-       vlanmc_priv.priority = vlanmc->priority;
-       vlanmc_priv.untag = vlanmc->untag;
-       vlanmc_priv.member = vlanmc->member;
-       vlanmc_priv.fid = vlanmc->fid;
-
-       addr = RTL8366S_VLAN_MEMCONF_BASE + (index << 1);
-
-       tableaddr = (u16 *)&vlanmc_priv;
-       data = *tableaddr;
-
-       err = rtl8366_smi_write_reg(smi, addr, data);
-       if (err)
-               return err;
-
-       addr = RTL8366S_VLAN_MEMCONF_BASE + 1 + (index << 1);
-
-       tableaddr++;
-       data = *tableaddr;
-
-       err = rtl8366_smi_write_reg(smi, addr, data);
-       if (err)
-               return err;
+       data[0] = (vlanmc->vid & RTL8366S_VLAN_VID_MASK) |
+                 ((vlanmc->priority & RTL8366S_VLAN_PRIORITY_MASK) <<
+                       RTL8366S_VLAN_PRIORITY_SHIFT);
+       data[1] = (vlanmc->member & RTL8366S_VLAN_MEMBER_MASK) |
+                 ((vlanmc->untag & RTL8366S_VLAN_UNTAG_MASK) <<
+                       RTL8366S_VLAN_UNTAG_SHIFT) |
+                 ((vlanmc->fid & RTL8366S_VLAN_FID_MASK) <<
+                       RTL8366S_VLAN_FID_SHIFT);
+
+       for (i = 0; i < 2; i++) {
+               err = rtl8366_smi_write_reg(smi,
+                                           RTL8366S_VLAN_MC_BASE(index) + i,
+                                           data[i]);
+               if (err)
+                       return err;
+       }
 
        return 0;
 }
@@ -635,7 +561,7 @@ static int rtl8366s_get_mc_index(struct rtl8366_smi *smi, int port, int *val)
        u32 data;
        int err;
 
-       if (port >= RTL8366_NUM_PORTS)
+       if (port >= RTL8366S_NUM_PORTS)
                return -EINVAL;
 
        err = rtl8366_smi_read_reg(smi, RTL8366S_PORT_VLAN_CTRL_REG(port),
@@ -651,7 +577,7 @@ static int rtl8366s_get_mc_index(struct rtl8366_smi *smi, int port, int *val)
 
 static int rtl8366s_set_mc_index(struct rtl8366_smi *smi, int port, int index)
 {
-       if (port >= RTL8366_NUM_PORTS || index >= RTL8366_NUM_VLANS)
+       if (port >= RTL8366S_NUM_PORTS || index >= RTL8366S_NUM_VLANS)
                return -EINVAL;
 
        return rtl8366_smi_rmwr(smi, RTL8366S_PORT_VLAN_CTRL_REG(port),
@@ -661,467 +587,44 @@ static int rtl8366s_set_mc_index(struct rtl8366_smi *smi, int port, int index)
                                        RTL8366S_PORT_VLAN_CTRL_SHIFT(port));
 }
 
-static int rtl8366s_set_vlan(struct rtl8366_smi *smi, int vid, u32 member,
-                            u32 untag, u32 fid)
+static int rtl8366s_enable_vlan(struct rtl8366_smi *smi, int enable)
 {
-       struct rtl8366_vlan_4k vlan4k;
-       int err;
-       int i;
-
-       /* Update the 4K table */
-       err = rtl8366s_get_vlan_4k(smi, vid, &vlan4k);
-       if (err)
-               return err;
-
-       vlan4k.member = member;
-       vlan4k.untag = untag;
-       vlan4k.fid = fid;
-       err = rtl8366s_set_vlan_4k(smi, &vlan4k);
-       if (err)
-               return err;
-
-       /* Try to find an existing MC entry for this VID */
-       for (i = 0; i < RTL8366_NUM_VLANS; i++) {
-               struct rtl8366_vlan_mc vlanmc;
-
-               err = rtl8366s_get_vlan_mc(smi, i, &vlanmc);
-               if (err)
-                       return err;
-
-               if (vid == vlanmc.vid) {
-                       /* update the MC entry */
-                       vlanmc.member = member;
-                       vlanmc.untag = untag;
-                       vlanmc.fid = fid;
-
-                       err = rtl8366s_set_vlan_mc(smi, i, &vlanmc);
-                       break;
-               }
-       }
-
-       return err;
-}
-
-static int rtl8366s_get_pvid(struct rtl8366_smi *smi, int port, int *val)
-{
-       struct rtl8366_vlan_mc vlanmc;
-       int err;
-       int index;
-
-       err = rtl8366s_get_mc_index(smi, port, &index);
-       if (err)
-               return err;
-
-       err = rtl8366s_get_vlan_mc(smi, index, &vlanmc);
-       if (err)
-               return err;
-
-       *val = vlanmc.vid;
-       return 0;
-}
-
-static int rtl8366s_mc_is_used(struct rtl8366_smi *smi, int mc_index,
-                              int *used)
-{
-       int err;
-       int i;
-
-       *used = 0;
-       for (i = 0; i < RTL8366_NUM_PORTS; i++) {
-               int index = 0;
-
-               err = rtl8366s_get_mc_index(smi, i, &index);
-               if (err)
-                       return err;
-
-               if (mc_index == index) {
-                       *used = 1;
-                       break;
-               }
-       }
-
-       return 0;
-}
-
-static int rtl8366s_set_pvid(struct rtl8366_smi *smi, unsigned port,
-                            unsigned vid)
-{
-       struct rtl8366_vlan_mc vlanmc;
-       struct rtl8366_vlan_4k vlan4k;
-       int err;
-       int i;
-
-       /* Try to find an existing MC entry for this VID */
-       for (i = 0; i < RTL8366_NUM_VLANS; i++) {
-               err = rtl8366s_get_vlan_mc(smi, i, &vlanmc);
-               if (err)
-                       return err;
-
-               if (vid == vlanmc.vid) {
-                       err = rtl8366s_set_vlan_mc(smi, i, &vlanmc);
-                       if (err)
-                               return err;
-
-                       err = rtl8366s_set_mc_index(smi, port, i);
-                       return err;
-               }
-       }
-
-       /* We have no MC entry for this VID, try to find an empty one */
-       for (i = 0; i < RTL8366_NUM_VLANS; i++) {
-               err = rtl8366s_get_vlan_mc(smi, i, &vlanmc);
-               if (err)
-                       return err;
-
-               if (vlanmc.vid == 0 && vlanmc.member == 0) {
-                       /* Update the entry from the 4K table */
-                       err = rtl8366s_get_vlan_4k(smi, vid, &vlan4k);
-                       if (err)
-                               return err;
-
-                       vlanmc.vid = vid;
-                       vlanmc.member = vlan4k.member;
-                       vlanmc.untag = vlan4k.untag;
-                       vlanmc.fid = vlan4k.fid;
-                       err = rtl8366s_set_vlan_mc(smi, i, &vlanmc);
-                       if (err)
-                               return err;
-
-                       err = rtl8366s_set_mc_index(smi, port, i);
-                       return err;
-               }
-       }
-
-       /* MC table is full, try to find an unused entry and replace it */
-       for (i = 0; i < RTL8366_NUM_VLANS; i++) {
-               int used;
-
-               err = rtl8366s_mc_is_used(smi, i, &used);
-               if (err)
-                       return err;
-
-               if (!used) {
-                       /* Update the entry from the 4K table */
-                       err = rtl8366s_get_vlan_4k(smi, vid, &vlan4k);
-                       if (err)
-                               return err;
-
-                       vlanmc.vid = vid;
-                       vlanmc.member = vlan4k.member;
-                       vlanmc.untag = vlan4k.untag;
-                       vlanmc.fid = vlan4k.fid;
-                       err = rtl8366s_set_vlan_mc(smi, i, &vlanmc);
-                       if (err)
-                               return err;
-
-                       err = rtl8366s_set_mc_index(smi, port, i);
-                       return err;
-               }
-       }
-
-       dev_err(smi->parent,
-               "all VLAN member configurations are in use\n");
-
-       return -ENOSPC;
-}
-
-static int rtl8366s_vlan_set_vlan(struct rtl8366_smi *smi, int enable)
-{
-       return rtl8366_smi_rmwr(smi, RTL8366_CHIP_GLOBAL_CTRL_REG,
-                               RTL8366_CHIP_CTRL_VLAN,
-                               (enable) ? RTL8366_CHIP_CTRL_VLAN : 0);
+       return rtl8366_smi_rmwr(smi, RTL8366S_SGCR, RTL8366S_SGCR_EN_VLAN,
+                               (enable) ? RTL8366S_SGCR_EN_VLAN : 0);
 }
 
-static int rtl8366s_vlan_set_4ktable(struct rtl8366_smi *smi, int enable)
+static int rtl8366s_enable_vlan4k(struct rtl8366_smi *smi, int enable)
 {
        return rtl8366_smi_rmwr(smi, RTL8366S_VLAN_TB_CTRL_REG,
                                1, (enable) ? 1 : 0);
 }
 
-static int rtl8366s_reset_vlan(struct rtl8366_smi *smi)
-{
-       struct rtl8366_vlan_mc vlanmc;
-       int err;
-       int i;
-
-       /* clear VLAN member configurations */
-       vlanmc.vid = 0;
-       vlanmc.priority = 0;
-       vlanmc.member = 0;
-       vlanmc.untag = 0;
-       vlanmc.fid = 0;
-       for (i = 0; i < RTL8366_NUM_VLANS; i++) {
-               err = rtl8366s_set_vlan_mc(smi, i, &vlanmc);
-               if (err)
-                       return err;
-       }
-
-       for (i = 0; i < RTL8366_NUM_PORTS; i++) {
-               if (i == RTL8366_PORT_CPU)
-                       continue;
-
-               err = rtl8366s_set_vlan(smi, (i + 1),
-                                        (1 << i) | RTL8366_PORT_CPU,
-                                        (1 << i) | RTL8366_PORT_CPU,
-                                        0);
-               if (err)
-                       return err;
-
-               err = rtl8366s_set_pvid(smi, i, (i + 1));
-               if (err)
-                       return err;
-       }
-
-       return 0;
-}
-
-#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
-static int rtl8366s_debugfs_open(struct inode *inode, struct file *file)
-{
-       file->private_data = inode->i_private;
-       return 0;
-}
-
-static ssize_t rtl8366s_read_debugfs_mibs(struct file *file,
-                                         char __user *user_buf,
-                                         size_t count, loff_t *ppos)
-{
-       struct rtl8366s *rtl = (struct rtl8366s *)file->private_data;
-       struct rtl8366_smi *smi = &rtl->smi;
-       int i, j, len = 0;
-       char *buf = rtl->buf;
-
-       len += snprintf(buf + len, sizeof(rtl->buf) - len,
-                       "%-36s %12s %12s %12s %12s %12s %12s\n",
-                       "Counter",
-                       "Port 0", "Port 1", "Port 2",
-                       "Port 3", "Port 4", "Port 5");
-
-       for (i = 0; i < ARRAY_SIZE(rtl8366s_mib_counters); ++i) {
-               len += snprintf(buf + len, sizeof(rtl->buf) - len, "%-36s ",
-                               rtl8366s_mib_counters[i].name);
-               for (j = 0; j < RTL8366_NUM_PORTS; ++j) {
-                       unsigned long long counter = 0;
-
-                       if (!rtl8366_get_mib_counter(smi, i, j, &counter))
-                               len += snprintf(buf + len,
-                                               sizeof(rtl->buf) - len,
-                                               "%12llu ", counter);
-                       else
-                               len += snprintf(buf + len,
-                                               sizeof(rtl->buf) - len,
-                                               "%12s ", "error");
-               }
-               len += snprintf(buf + len, sizeof(rtl->buf) - len, "\n");
-       }
-
-       return simple_read_from_buffer(user_buf, count, ppos, buf, len);
-}
-
-static ssize_t rtl8366s_read_debugfs_vlan_mc(struct file *file,
-                                            char __user *user_buf,
-                                            size_t count, loff_t *ppos)
-{
-       struct rtl8366s *rtl = (struct rtl8366s *)file->private_data;
-       struct rtl8366_smi *smi = &rtl->smi;
-       int i, len = 0;
-       char *buf = rtl->buf;
-
-       len += snprintf(buf + len, sizeof(rtl->buf) - len,
-                       "%2s %6s %4s %6s %6s %3s\n",
-                       "id", "vid","prio", "member", "untag", "fid");
-
-       for (i = 0; i < RTL8366_NUM_VLANS; ++i) {
-               struct rtl8366_vlan_mc vlanmc;
-
-               rtl8366s_get_vlan_mc(smi, i, &vlanmc);
-
-               len += snprintf(buf + len, sizeof(rtl->buf) - len,
-                               "%2d %6d %4d 0x%04x 0x%04x %3d\n",
-                               i, vlanmc.vid, vlanmc.priority,
-                               vlanmc.member, vlanmc.untag, vlanmc.fid);
-       }
-
-       return simple_read_from_buffer(user_buf, count, ppos, buf, len);
-}
-
-static ssize_t rtl8366s_read_debugfs_reg(struct file *file,
-                                        char __user *user_buf,
-                                        size_t count, loff_t *ppos)
-{
-       struct rtl8366s *rtl = (struct rtl8366s *)file->private_data;
-       struct rtl8366_smi *smi = &rtl->smi;
-       u32 t, reg = g_dbg_reg;
-       int err, len = 0;
-       char *buf = rtl->buf;
-
-       memset(buf, '\0', sizeof(rtl->buf));
-
-       err = rtl8366_smi_read_reg(smi, reg, &t);
-       if (err) {
-               len += snprintf(buf, sizeof(rtl->buf),
-                               "Read failed (reg: 0x%04x)\n", reg);
-               return simple_read_from_buffer(user_buf, count, ppos, buf, len);
-       }
-
-       len += snprintf(buf, sizeof(rtl->buf), "reg = 0x%04x, val = 0x%04x\n",
-                       reg, t);
-
-       return simple_read_from_buffer(user_buf, count, ppos, buf, len);
-}
-
-static ssize_t rtl8366s_write_debugfs_reg(struct file *file,
-                                         const char __user *user_buf,
-                                         size_t count, loff_t *ppos)
+static int rtl8366s_is_vlan_valid(struct rtl8366_smi *smi, unsigned vlan)
 {
-       struct rtl8366s *rtl = (struct rtl8366s *)file->private_data;
-       struct rtl8366_smi *smi = &rtl->smi;
-       unsigned long data;
-       u32 reg = g_dbg_reg;
-       int err;
-       size_t len;
-       char *buf = rtl->buf;
-
-       len = min(count, sizeof(rtl->buf) - 1);
-       if (copy_from_user(buf, user_buf, len)) {
-               dev_err(rtl->parent, "copy from user failed\n");
-               return -EFAULT;
-       }
-
-       buf[len] = '\0';
-       if (len > 0 && buf[len - 1] == '\n')
-               buf[len - 1] = '\0';
-
-
-       if (strict_strtoul(buf, 16, &data)) {
-               dev_err(rtl->parent, "Invalid reg value %s\n", buf);
-       } else {
-               err = rtl8366_smi_write_reg(smi, reg, data);
-               if (err) {
-                       dev_err(rtl->parent,
-                               "writing reg 0x%04x val 0x%04lx failed\n",
-                               reg, data);
-               }
-       }
-
-       return count;
-}
-
-static const struct file_operations fops_rtl8366s_regs = {
-       .read = rtl8366s_read_debugfs_reg,
-       .write = rtl8366s_write_debugfs_reg,
-       .open = rtl8366s_debugfs_open,
-       .owner = THIS_MODULE
-};
-
-static const struct file_operations fops_rtl8366s_vlan_mc = {
-       .read = rtl8366s_read_debugfs_vlan_mc,
-       .open = rtl8366s_debugfs_open,
-       .owner = THIS_MODULE
-};
-
-static const struct file_operations fops_rtl8366s_mibs = {
-       .read = rtl8366s_read_debugfs_mibs,
-       .open = rtl8366s_debugfs_open,
-       .owner = THIS_MODULE
-};
-
-static void rtl8366s_debugfs_init(struct rtl8366s *rtl)
-{
-       struct dentry *node;
-       struct dentry *root;
-
-       if (!rtl->debugfs_root)
-               rtl->debugfs_root = debugfs_create_dir("rtl8366s", NULL);
-
-       if (!rtl->debugfs_root) {
-               dev_err(rtl->parent, "Unable to create debugfs dir\n");
-               return;
-       }
-       root = rtl->debugfs_root;
+       unsigned max = RTL8366S_NUM_VLANS;
 
-       node = debugfs_create_x16("reg", S_IRUGO | S_IWUSR, root, &g_dbg_reg);
-       if (!node) {
-               dev_err(rtl->parent, "Creating debugfs file '%s' failed\n",
-                       "reg");
-               return;
-       }
+       if (smi->vlan4k_enabled)
+               max = RTL8366S_NUM_VIDS - 1;
 
-       node = debugfs_create_file("val", S_IRUGO | S_IWUSR, root, rtl,
-                                  &fops_rtl8366s_regs);
-       if (!node) {
-               dev_err(rtl->parent, "Creating debugfs file '%s' failed\n",
-                       "val");
-               return;
-       }
+       if (vlan == 0 || vlan >= max)
+               return 0;
 
-       node = debugfs_create_file("vlan_mc", S_IRUSR, root, rtl,
-                                  &fops_rtl8366s_vlan_mc);
-       if (!node) {
-               dev_err(rtl->parent, "Creating debugfs file '%s' failed\n",
-                       "vlan_mc");
-               return;
-       }
-
-       node = debugfs_create_file("mibs", S_IRUSR, root, rtl,
-                                  &fops_rtl8366s_mibs);
-       if (!node) {
-               dev_err(rtl->parent, "Creating debugfs file '%s' failed\n",
-                       "mibs");
-               return;
-       }
+       return 1;
 }
 
-static void rtl8366s_debugfs_remove(struct rtl8366s *rtl)
+static int rtl8366s_enable_port(struct rtl8366_smi *smi, int port, int enable)
 {
-       if (rtl->debugfs_root) {
-               debugfs_remove_recursive(rtl->debugfs_root);
-               rtl->debugfs_root = NULL;
-       }
+       return rtl8366_smi_rmwr(smi, RTL8366S_PECR, (1 << port),
+                               (enable) ? 0 : (1 << port));
 }
 
-#else
-static inline void rtl8366s_debugfs_init(struct rtl8366s *rtl) {}
-static inline void rtl8366s_debugfs_remove(struct rtl8366s *rtl) {}
-#endif /* CONFIG_RTL8366S_PHY_DEBUG_FS */
-
 static int rtl8366s_sw_reset_mibs(struct switch_dev *dev,
                                  const struct switch_attr *attr,
                                  struct switch_val *val)
 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-       int err = 0;
-
-       if (val->value.i == 1)
-               err = rtl8366_smi_rmwr(smi, RTL8366S_MIB_CTRL_REG, 0, (1 << 2));
 
-       return err;
-}
-
-static int rtl8366s_sw_get_vlan_enable(struct switch_dev *dev,
-                                      const struct switch_attr *attr,
-                                      struct switch_val *val)
-{
-       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-       u32 data;
-
-       if (attr->ofs == 1) {
-               rtl8366_smi_read_reg(smi, RTL8366_CHIP_GLOBAL_CTRL_REG, &data);
-
-               if (data & RTL8366_CHIP_CTRL_VLAN)
-                       val->value.i = 1;
-               else
-                       val->value.i = 0;
-       } else if (attr->ofs == 2) {
-               rtl8366_smi_read_reg(smi, RTL8366S_VLAN_TB_CTRL_REG, &data);
-
-               if (data & 0x0001)
-                       val->value.i = 1;
-               else
-                       val->value.i = 0;
-       }
-
-       return 0;
+       return rtl8366_smi_rmwr(smi, RTL8366S_MIB_CTRL_REG, 0, (1 << 2));
 }
 
 static int rtl8366s_sw_get_blinkrate(struct switch_dev *dev,
@@ -1131,9 +634,9 @@ static int rtl8366s_sw_get_blinkrate(struct switch_dev *dev,
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
        u32 data;
 
-       rtl8366_smi_read_reg(smi, RTL8366_LED_BLINKRATE_REG, &data);
+       rtl8366_smi_read_reg(smi, RTL8366S_LED_BLINKRATE_REG, &data);
 
-       val->value.i = (data & (RTL8366_LED_BLINKRATE_MASK));
+       val->value.i = (data & (RTL8366S_LED_BLINKRATE_MASK));
 
        return 0;
 }
@@ -1147,119 +650,130 @@ static int rtl8366s_sw_set_blinkrate(struct switch_dev *dev,
        if (val->value.i >= 6)
                return -EINVAL;
 
-       return rtl8366_smi_rmwr(smi, RTL8366_LED_BLINKRATE_REG,
-                               RTL8366_LED_BLINKRATE_MASK,
+       return rtl8366_smi_rmwr(smi, RTL8366S_LED_BLINKRATE_REG,
+                               RTL8366S_LED_BLINKRATE_MASK,
                                val->value.i);
 }
 
-static int rtl8366s_sw_set_vlan_enable(struct switch_dev *dev,
-                                      const struct switch_attr *attr,
-                                      struct switch_val *val)
+static int rtl8366s_sw_get_max_length(struct switch_dev *dev,
+                                       const struct switch_attr *attr,
+                                       struct switch_val *val)
 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+       u32 data;
+
+       rtl8366_smi_read_reg(smi, RTL8366S_SGCR, &data);
+
+       val->value.i = ((data & (RTL8366S_SGCR_MAX_LENGTH_MASK)) >> 4);
 
-       if (attr->ofs == 1)
-               return rtl8366s_vlan_set_vlan(smi, val->value.i);
-       else
-               return rtl8366s_vlan_set_4ktable(smi, val->value.i);
+       return 0;
 }
 
-static const char *rtl8366s_speed_str(unsigned speed)
+static int rtl8366s_sw_set_max_length(struct switch_dev *dev,
+                                       const struct switch_attr *attr,
+                                       struct switch_val *val)
 {
-       switch (speed) {
-       case 0:
-               return "10baseT";
-       case 1:
-               return "100baseT";
-       case 2:
-               return "1000baseT";
+       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+       char length_code;
+
+       switch (val->value.i) {
+               case 0:
+                       length_code = RTL8366S_SGCR_MAX_LENGTH_1522;
+                       break;
+               case 1:
+                       length_code = RTL8366S_SGCR_MAX_LENGTH_1536;
+                       break;
+               case 2:
+                       length_code = RTL8366S_SGCR_MAX_LENGTH_1552;
+                       break;
+               case 3:
+                       length_code = RTL8366S_SGCR_MAX_LENGTH_16000;
+                       break;
+               default:
+                       return -EINVAL;
        }
 
-       return "unknown";
+       return rtl8366_smi_rmwr(smi, RTL8366S_SGCR,
+                       RTL8366S_SGCR_MAX_LENGTH_MASK,
+                       length_code);
 }
 
-static int rtl8366s_sw_get_port_link(struct switch_dev *dev,
-                                    const struct switch_attr *attr,
-                                    struct switch_val *val)
+static int rtl8366s_sw_get_learning_enable(struct switch_dev *dev,
+                                          const struct switch_attr *attr,
+                                          struct switch_val *val)
 {
-       struct rtl8366s *rtl = sw_to_rtl8366s(dev);
-       struct rtl8366_smi *smi = &rtl->smi;
-       u32 len = 0, data = 0;
+       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+       u32 data;
 
-       if (val->port_vlan >= RTL8366_NUM_PORTS)
-               return -EINVAL;
+       rtl8366_smi_read_reg(smi,RTL8366S_SSCR0, &data);
+       val->value.i = !data;
 
-       memset(rtl->buf, '\0', sizeof(rtl->buf));
-       rtl8366_smi_read_reg(smi, RTL8366S_PORT_LINK_STATUS_BASE +
-                            (val->port_vlan / 2), &data);
+       return 0;
+}
 
-       if (val->port_vlan % 2)
-               data = data >> 8;
 
-       if (data & RTL8366S_PORT_STATUS_LINK_MASK) {
-               len = snprintf(rtl->buf, sizeof(rtl->buf),
-                               "port:%d link:up speed:%s %s-duplex %s%s%s",
-                               val->port_vlan,
-                               rtl8366s_speed_str(data &
-                                         RTL8366S_PORT_STATUS_SPEED_MASK),
-                               (data & RTL8366S_PORT_STATUS_DUPLEX_MASK) ?
-                                       "full" : "half",
-                               (data & RTL8366S_PORT_STATUS_TXPAUSE_MASK) ?
-                                       "tx-pause ": "",
-                               (data & RTL8366S_PORT_STATUS_RXPAUSE_MASK) ?
-                                       "rx-pause " : "",
-                               (data & RTL8366S_PORT_STATUS_AN_MASK) ?
-                                       "nway ": "");
-       } else {
-               len = snprintf(rtl->buf, sizeof(rtl->buf), "port:%d link: down",
-                               val->port_vlan);
-       }
+static int rtl8366s_sw_set_learning_enable(struct switch_dev *dev,
+                                          const struct switch_attr *attr,
+                                          struct switch_val *val)
+{
+       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+       u32 portmask = 0;
+       int err = 0;
+
+       if (!val->value.i)
+               portmask = RTL8366S_PORT_ALL;
+
+       /* set learning for all ports */
+       REG_WR(smi, RTL8366S_SSCR0, portmask);
 
-       val->value.s = rtl->buf;
-       val->len = len;
+       /* set auto ageing for all ports */
+       REG_WR(smi, RTL8366S_SSCR1, portmask);
 
        return 0;
 }
 
-static int rtl8366s_sw_get_vlan_info(struct switch_dev *dev,
-                                    const struct switch_attr *attr,
-                                    struct switch_val *val)
+static int rtl8366s_sw_get_port_link(struct switch_dev *dev,
+                                    int port,
+                                    struct switch_port_link *link)
 {
-       int i;
-       u32 len = 0;
-       struct rtl8366_vlan_4k vlan4k;
-       struct rtl8366s *rtl = sw_to_rtl8366s(dev);
-       struct rtl8366_smi *smi = &rtl->smi;
-       char *buf = rtl->buf;
-       int err;
+       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+       u32 data = 0;
+       u32 speed;
 
-       if (val->port_vlan == 0 || val->port_vlan >= RTL8366_NUM_VLANS)
+       if (port >= RTL8366S_NUM_PORTS)
                return -EINVAL;
 
-       memset(buf, '\0', sizeof(rtl->buf));
+       rtl8366_smi_read_reg(smi, RTL8366S_PORT_LINK_STATUS_BASE + (port / 2),
+                            &data);
 
-       err = rtl8366s_get_vlan_4k(smi, val->port_vlan, &vlan4k);
-       if (err)
-               return err;
+       if (port % 2)
+               data = data >> 8;
 
-       len += snprintf(buf + len, sizeof(rtl->buf) - len,
-                       "VLAN %d: Ports: '", vlan4k.vid);
+       link->link = !!(data & RTL8366S_PORT_STATUS_LINK_MASK);
+       if (!link->link)
+               return 0;
 
-       for (i = 0; i < RTL8366_NUM_PORTS; i++) {
-               if (!(vlan4k.member & (1 << i)))
-                       continue;
+       link->duplex = !!(data & RTL8366S_PORT_STATUS_DUPLEX_MASK);
+       link->rx_flow = !!(data & RTL8366S_PORT_STATUS_RXPAUSE_MASK);
+       link->tx_flow = !!(data & RTL8366S_PORT_STATUS_TXPAUSE_MASK);
+       link->aneg = !!(data & RTL8366S_PORT_STATUS_AN_MASK);
 
-               len += snprintf(buf + len, sizeof(rtl->buf) - len, "%d%s", i,
-                               (vlan4k.untag & (1 << i)) ? "" : "t");
+       speed = (data & RTL8366S_PORT_STATUS_SPEED_MASK);
+       switch (speed) {
+       case 0:
+               link->speed = SWITCH_PORT_SPEED_10;
+               break;
+       case 1:
+               link->speed = SWITCH_PORT_SPEED_100;
+               break;
+       case 2:
+               link->speed = SWITCH_PORT_SPEED_1000;
+               break;
+       default:
+               link->speed = SWITCH_PORT_SPEED_UNKNOWN;
+               break;
        }
 
-       len += snprintf(buf + len, sizeof(rtl->buf) - len,
-                       "', members=%04x, untag=%04x, fid=%u",
-                       vlan4k.member, vlan4k.untag, vlan4k.fid);
-
-       val->value.s = buf;
-       val->len = len;
-
        return 0;
 }
 
@@ -1272,21 +786,21 @@ static int rtl8366s_sw_set_port_led(struct switch_dev *dev,
        u32 mask;
        u32 reg;
 
-       if (val->port_vlan >= RTL8366_NUM_PORTS ||
-           (1 << val->port_vlan) == RTL8366_PORT_UNKNOWN)
+       if (val->port_vlan >= RTL8366S_NUM_PORTS ||
+           (1 << val->port_vlan) == RTL8366S_PORT_UNKNOWN)
                return -EINVAL;
 
-       if (val->port_vlan == RTL8366_PORT_NUM_CPU) {
-               reg = RTL8366_LED_BLINKRATE_REG;
+       if (val->port_vlan == RTL8366S_PORT_NUM_CPU) {
+               reg = RTL8366S_LED_BLINKRATE_REG;
                mask = 0xF << 4;
                data = val->value.i << 4;
        } else {
-               reg = RTL8366_LED_CTRL_REG;
+               reg = RTL8366S_LED_CTRL_REG;
                mask = 0xF << (val->port_vlan * 4),
                data = val->value.i << (val->port_vlan * 4);
        }
 
-       return rtl8366_smi_rmwr(smi, RTL8366_LED_BLINKRATE_REG, mask, data);
+       return rtl8366_smi_rmwr(smi, reg, mask, data);
 }
 
 static int rtl8366s_sw_get_port_led(struct switch_dev *dev,
@@ -1296,10 +810,10 @@ static int rtl8366s_sw_get_port_led(struct switch_dev *dev,
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
        u32 data = 0;
 
-       if (val->port_vlan >= RTL8366_NUM_LEDGROUPS)
+       if (val->port_vlan >= RTL8366S_NUM_LEDGROUPS)
                return -EINVAL;
 
-       rtl8366_smi_read_reg(smi, RTL8366_LED_CTRL_REG, &data);
+       rtl8366_smi_read_reg(smi, RTL8366S_LED_CTRL_REG, &data);
        val->value.i = (data >> (val->port_vlan * 4)) & 0x000F;
 
        return 0;
@@ -1311,7 +825,7 @@ static int rtl8366s_sw_reset_port_mibs(struct switch_dev *dev,
 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
 
-       if (val->port_vlan >= RTL8366_NUM_PORTS)
+       if (val->port_vlan >= RTL8366S_NUM_PORTS)
                return -EINVAL;
 
 
@@ -1319,102 +833,6 @@ static int rtl8366s_sw_reset_port_mibs(struct switch_dev *dev,
                                0, (1 << (val->port_vlan + 3)));
 }
 
-static int rtl8366s_sw_get_port_mib(struct switch_dev *dev,
-                                   const struct switch_attr *attr,
-                                   struct switch_val *val)
-{
-       struct rtl8366s *rtl = sw_to_rtl8366s(dev);
-       struct rtl8366_smi *smi = &rtl->smi;
-       int i, len = 0;
-       unsigned long long counter = 0;
-       char *buf = rtl->buf;
-
-       if (val->port_vlan >= RTL8366_NUM_PORTS)
-               return -EINVAL;
-
-       len += snprintf(buf + len, sizeof(rtl->buf) - len,
-                       "Port %d MIB counters\n",
-                       val->port_vlan);
-
-       for (i = 0; i < ARRAY_SIZE(rtl8366s_mib_counters); ++i) {
-               len += snprintf(buf + len, sizeof(rtl->buf) - len,
-                               "%-36s: ", rtl8366s_mib_counters[i].name);
-               if (!rtl8366_get_mib_counter(smi, i, val->port_vlan, &counter))
-                       len += snprintf(buf + len, sizeof(rtl->buf) - len,
-                                       "%llu\n", counter);
-               else
-                       len += snprintf(buf + len, sizeof(rtl->buf) - len,
-                                       "%s\n", "error");
-       }
-
-       val->value.s = buf;
-       val->len = len;
-       return 0;
-}
-
-static int rtl8366s_sw_get_vlan_ports(struct switch_dev *dev,
-                                     struct switch_val *val)
-{
-       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-       struct switch_port *port;
-       struct rtl8366_vlan_4k vlan4k;
-       int i;
-
-       if (val->port_vlan == 0 || val->port_vlan >= RTL8366_NUM_VLANS)
-               return -EINVAL;
-
-       rtl8366s_get_vlan_4k(smi, val->port_vlan, &vlan4k);
-
-       port = &val->value.ports[0];
-       val->len = 0;
-       for (i = 0; i < RTL8366_NUM_PORTS; i++) {
-               if (!(vlan4k.member & BIT(i)))
-                       continue;
-
-               port->id = i;
-               port->flags = (vlan4k.untag & BIT(i)) ?
-                                       0 : BIT(SWITCH_PORT_FLAG_TAGGED);
-               val->len++;
-               port++;
-       }
-       return 0;
-}
-
-static int rtl8366s_sw_set_vlan_ports(struct switch_dev *dev,
-                                     struct switch_val *val)
-{
-       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-       struct switch_port *port;
-       u32 member = 0;
-       u32 untag = 0;
-       int i;
-
-       if (val->port_vlan == 0 || val->port_vlan >= RTL8366_NUM_VLANS)
-               return -EINVAL;
-
-       port = &val->value.ports[0];
-       for (i = 0; i < val->len; i++, port++) {
-               member |= BIT(port->id);
-
-               if (!(port->flags & BIT(SWITCH_PORT_FLAG_TAGGED)))
-                       untag |= BIT(port->id);
-       }
-
-       return rtl8366s_set_vlan(smi, val->port_vlan, member, untag, 0);
-}
-
-static int rtl8366s_sw_get_port_pvid(struct switch_dev *dev, int port, int *val)
-{
-       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-       return rtl8366s_get_pvid(smi, port, val);
-}
-
-static int rtl8366s_sw_set_port_pvid(struct switch_dev *dev, int port, int val)
-{
-       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-       return rtl8366s_set_pvid(smi, port, val);
-}
-
 static int rtl8366s_sw_reset_switch(struct switch_dev *dev)
 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
@@ -1428,33 +846,46 @@ static int rtl8366s_sw_reset_switch(struct switch_dev *dev)
        if (err)
                return err;
 
-       return rtl8366s_reset_vlan(smi);
+       err = rtl8366_reset_vlan(smi);
+       if (err)
+               return err;
+
+       err = rtl8366_enable_vlan(smi, 1);
+       if (err)
+               return err;
+
+       return rtl8366_enable_all_ports(smi, 1);
 }
 
 static struct switch_attr rtl8366s_globals[] = {
        {
+               .type = SWITCH_TYPE_INT,
+               .name = "enable_learning",
+               .description = "Enable learning, enable aging",
+               .set = rtl8366s_sw_set_learning_enable,
+               .get = rtl8366s_sw_get_learning_enable,
+               .max = 1,
+       }, {
                .type = SWITCH_TYPE_INT,
                .name = "enable_vlan",
                .description = "Enable VLAN mode",
-               .set = rtl8366s_sw_set_vlan_enable,
-               .get = rtl8366s_sw_get_vlan_enable,
+               .set = rtl8366_sw_set_vlan_enable,
+               .get = rtl8366_sw_get_vlan_enable,
                .max = 1,
                .ofs = 1
        }, {
                .type = SWITCH_TYPE_INT,
                .name = "enable_vlan4k",
                .description = "Enable VLAN 4K mode",
-               .set = rtl8366s_sw_set_vlan_enable,
-               .get = rtl8366s_sw_get_vlan_enable,
+               .set = rtl8366_sw_set_vlan_enable,
+               .get = rtl8366_sw_get_vlan_enable,
                .max = 1,
                .ofs = 2
        }, {
-               .type = SWITCH_TYPE_INT,
+               .type = SWITCH_TYPE_NOVAL,
                .name = "reset_mibs",
                .description = "Reset all MIB counters",
                .set = rtl8366s_sw_reset_mibs,
-               .get = NULL,
-               .max = 1
        }, {
                .type = SWITCH_TYPE_INT,
                .name = "blinkrate",
@@ -1463,31 +894,30 @@ static struct switch_attr rtl8366s_globals[] = {
                .set = rtl8366s_sw_set_blinkrate,
                .get = rtl8366s_sw_get_blinkrate,
                .max = 5
+       }, {
+               .type = SWITCH_TYPE_INT,
+               .name = "max_length",
+               .description = "Get/Set the maximum length of valid packets"
+               " (0 = 1522, 1 = 1536, 2 = 1552, 3 = 16000 (9216?))",
+               .set = rtl8366s_sw_set_max_length,
+               .get = rtl8366s_sw_get_max_length,
+               .max = 3,
        },
 };
 
 static struct switch_attr rtl8366s_port[] = {
        {
-               .type = SWITCH_TYPE_STRING,
-               .name = "link",
-               .description = "Get port link information",
-               .max = 1,
-               .set = NULL,
-               .get = rtl8366s_sw_get_port_link,
-       }, {
-               .type = SWITCH_TYPE_INT,
+               .type = SWITCH_TYPE_NOVAL,
                .name = "reset_mib",
                .description = "Reset single port MIB counters",
-               .max = 1,
                .set = rtl8366s_sw_reset_port_mibs,
-               .get = NULL,
        }, {
                .type = SWITCH_TYPE_STRING,
                .name = "mib",
                .description = "Get MIB counters for port",
                .max = 33,
                .set = NULL,
-               .get = rtl8366s_sw_get_port_mib,
+               .get = rtl8366_sw_get_port_mib,
        }, {
                .type = SWITCH_TYPE_INT,
                .name = "led",
@@ -1505,16 +935,18 @@ static struct switch_attr rtl8366s_vlan[] = {
                .description = "Get vlan information",
                .max = 1,
                .set = NULL,
-               .get = rtl8366s_sw_get_vlan_info,
+               .get = rtl8366_sw_get_vlan_info,
+       }, {
+               .type = SWITCH_TYPE_INT,
+               .name = "fid",
+               .description = "Get/Set vlan FID",
+               .max = RTL8366S_FIDMAX,
+               .set = rtl8366_sw_set_vlan_fid,
+               .get = rtl8366_sw_get_vlan_fid,
        },
 };
 
-/* template */
-static struct switch_dev rtl8366_switch_dev = {
-       .name = "RTL8366S",
-       .cpu_port = RTL8366_PORT_NUM_CPU,
-       .ports = RTL8366_NUM_PORTS,
-       .vlans = RTL8366_NUM_VLANS,
+static const struct switch_dev_ops rtl8366_ops = {
        .attr_global = {
                .attr = rtl8366s_globals,
                .n_attr = ARRAY_SIZE(rtl8366s_globals),
@@ -1528,32 +960,36 @@ static struct switch_dev rtl8366_switch_dev = {
                .n_attr = ARRAY_SIZE(rtl8366s_vlan),
        },
 
-       .get_vlan_ports = rtl8366s_sw_get_vlan_ports,
-       .set_vlan_ports = rtl8366s_sw_set_vlan_ports,
-       .get_port_pvid = rtl8366s_sw_get_port_pvid,
-       .set_port_pvid = rtl8366s_sw_set_port_pvid,
+       .get_vlan_ports = rtl8366_sw_get_vlan_ports,
+       .set_vlan_ports = rtl8366_sw_set_vlan_ports,
+       .get_port_pvid = rtl8366_sw_get_port_pvid,
+       .set_port_pvid = rtl8366_sw_set_port_pvid,
        .reset_switch = rtl8366s_sw_reset_switch,
+       .get_port_link = rtl8366s_sw_get_port_link,
 };
 
-static int rtl8366s_switch_init(struct rtl8366s *rtl)
+static int rtl8366s_switch_init(struct rtl8366_smi *smi)
 {
-       struct switch_dev *dev = &rtl->dev;
+       struct switch_dev *dev = &smi->sw_dev;
        int err;
 
-       memcpy(dev, &rtl8366_switch_dev, sizeof(struct switch_dev));
-       dev->priv = rtl;
-       dev->devname = dev_name(rtl->parent);
+       dev->name = "RTL8366S";
+       dev->cpu_port = RTL8366S_PORT_NUM_CPU;
+       dev->ports = RTL8366S_NUM_PORTS;
+       dev->vlans = RTL8366S_NUM_VIDS;
+       dev->ops = &rtl8366_ops;
+       dev->alias = dev_name(smi->parent);
 
        err = register_switch(dev, NULL);
        if (err)
-               dev_err(rtl->parent, "switch registration failed\n");
+               dev_err(smi->parent, "switch registration failed\n");
 
        return err;
 }
 
-static void rtl8366s_switch_cleanup(struct rtl8366s *rtl)
+static void rtl8366s_switch_cleanup(struct rtl8366_smi *smi)
 {
-       unregister_switch(&rtl->dev);
+       unregister_switch(&smi->sw_dev);
 }
 
 static int rtl8366s_mii_read(struct mii_bus *bus, int addr, int reg)
@@ -1582,19 +1018,10 @@ static int rtl8366s_mii_write(struct mii_bus *bus, int addr, int reg, u16 val)
        return err;
 }
 
-static int rtl8366s_mii_bus_match(struct mii_bus *bus)
-{
-       return (bus->read == rtl8366s_mii_read &&
-               bus->write == rtl8366s_mii_write);
-}
-
-static int rtl8366s_setup(struct rtl8366s *rtl)
+static int rtl8366s_setup(struct rtl8366_smi *smi)
 {
-       struct rtl8366_smi *smi = &rtl->smi;
        int ret;
 
-       rtl8366s_debugfs_init(rtl);
-
        ret = rtl8366s_reset_chip(smi);
        if (ret)
                return ret;
@@ -1638,15 +1065,28 @@ static int rtl8366s_detect(struct rtl8366_smi *smi)
 
 static struct rtl8366_smi_ops rtl8366s_smi_ops = {
        .detect         = rtl8366s_detect,
+       .setup          = rtl8366s_setup,
+
        .mii_read       = rtl8366s_mii_read,
        .mii_write      = rtl8366s_mii_write,
+
+       .get_vlan_mc    = rtl8366s_get_vlan_mc,
+       .set_vlan_mc    = rtl8366s_set_vlan_mc,
+       .get_vlan_4k    = rtl8366s_get_vlan_4k,
+       .set_vlan_4k    = rtl8366s_set_vlan_4k,
+       .get_mc_index   = rtl8366s_get_mc_index,
+       .set_mc_index   = rtl8366s_set_mc_index,
+       .get_mib_counter = rtl8366_get_mib_counter,
+       .is_vlan_valid  = rtl8366s_is_vlan_valid,
+       .enable_vlan    = rtl8366s_enable_vlan,
+       .enable_vlan4k  = rtl8366s_enable_vlan4k,
+       .enable_port    = rtl8366s_enable_port,
 };
 
-static int __init rtl8366s_probe(struct platform_device *pdev)
+static int __devinit rtl8366s_probe(struct platform_device *pdev)
 {
        static int rtl8366_smi_version_printed;
-       struct rtl8366s_platform_data *pdata;
-       struct rtl8366s *rtl;
+       struct rtl8366_platform_data *pdata;
        struct rtl8366_smi *smi;
        int err;
 
@@ -1661,32 +1101,31 @@ static int __init rtl8366s_probe(struct platform_device *pdev)
                goto err_out;
        }
 
-       rtl = kzalloc(sizeof(*rtl), GFP_KERNEL);
-       if (!rtl) {
-               dev_err(&pdev->dev, "no memory for private data\n");
+       smi = rtl8366_smi_alloc(&pdev->dev);
+       if (!smi) {
                err = -ENOMEM;
                goto err_out;
        }
 
-       rtl->parent = &pdev->dev;
-
-       smi = &rtl->smi;
-       smi->parent = &pdev->dev;
        smi->gpio_sda = pdata->gpio_sda;
        smi->gpio_sck = pdata->gpio_sck;
+       smi->clk_delay = 10;
+       smi->cmd_read = 0xa9;
+       smi->cmd_write = 0xa8;
        smi->ops = &rtl8366s_smi_ops;
+       smi->cpu_port = RTL8366S_PORT_NUM_CPU;
+       smi->num_ports = RTL8366S_NUM_PORTS;
+       smi->num_vlan_mc = RTL8366S_NUM_VLANS;
+       smi->mib_counters = rtl8366s_mib_counters;
+       smi->num_mib_counters = ARRAY_SIZE(rtl8366s_mib_counters);
 
        err = rtl8366_smi_init(smi);
        if (err)
-               goto err_free_rtl;
+               goto err_free_smi;
 
-       platform_set_drvdata(pdev, rtl);
+       platform_set_drvdata(pdev, smi);
 
-       err = rtl8366s_setup(rtl);
-       if (err)
-               goto err_clear_drvdata;
-
-       err = rtl8366s_switch_init(rtl);
+       err = rtl8366s_switch_init(smi);
        if (err)
                goto err_clear_drvdata;
 
@@ -1695,48 +1134,21 @@ static int __init rtl8366s_probe(struct platform_device *pdev)
  err_clear_drvdata:
        platform_set_drvdata(pdev, NULL);
        rtl8366_smi_cleanup(smi);
- err_free_rtl:
-       kfree(rtl);
+ err_free_smi:
+       kfree(smi);
  err_out:
        return err;
 }
 
-static int rtl8366s_phy_config_init(struct phy_device *phydev)
-{
-       if (!rtl8366s_mii_bus_match(phydev->bus))
-               return -EINVAL;
-
-       return 0;
-}
-
-static int rtl8366s_phy_config_aneg(struct phy_device *phydev)
-{
-       return 0;
-}
-
-static struct phy_driver rtl8366s_phy_driver = {
-       .phy_id         = 0x001cc960,
-       .name           = "Realtek RTL8366S",
-       .phy_id_mask    = 0x1ffffff0,
-       .features       = PHY_GBIT_FEATURES,
-       .config_aneg    = rtl8366s_phy_config_aneg,
-       .config_init    = rtl8366s_phy_config_init,
-       .read_status    = genphy_read_status,
-       .driver         = {
-               .owner = THIS_MODULE,
-       },
-};
-
 static int __devexit rtl8366s_remove(struct platform_device *pdev)
 {
-       struct rtl8366s *rtl = platform_get_drvdata(pdev);
+       struct rtl8366_smi *smi = platform_get_drvdata(pdev);
 
-       if (rtl) {
-               rtl8366s_switch_cleanup(rtl);
-               rtl8366s_debugfs_remove(rtl);
+       if (smi) {
+               rtl8366s_switch_cleanup(smi);
                platform_set_drvdata(pdev, NULL);
-               rtl8366_smi_cleanup(&rtl->smi);
-               kfree(rtl);
+               rtl8366_smi_cleanup(smi);
+               kfree(smi);
        }
 
        return 0;
@@ -1753,26 +1165,12 @@ static struct platform_driver rtl8366s_driver = {
 
 static int __init rtl8366s_module_init(void)
 {
-       int ret;
-       ret = platform_driver_register(&rtl8366s_driver);
-       if (ret)
-               return ret;
-
-       ret = phy_driver_register(&rtl8366s_phy_driver);
-       if (ret)
-               goto err_platform_unregister;
-
-       return 0;
-
- err_platform_unregister:
-       platform_driver_unregister(&rtl8366s_driver);
-       return ret;
+       return platform_driver_register(&rtl8366s_driver);
 }
 module_init(rtl8366s_module_init);
 
 static void __exit rtl8366s_module_exit(void)
 {
-       phy_driver_unregister(&rtl8366s_phy_driver);
        platform_driver_unregister(&rtl8366s_driver);
 }
 module_exit(rtl8366s_module_exit);
This page took 0.108625 seconds and 4 git commands to generate.