generic: provide get_port_stats() on rtl836x switches
[openwrt/openwrt.git] / target / linux / generic / files / drivers / net / phy / rtl8366s.c
index f9a4c8c279bbeac329e7f924c0c502921001b35e..3f458f9dec91e9ef9fe732d5e9728270e6b72ab1 100644 (file)
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/platform_device.h>
+#include <linux/device.h>
+#include <linux/of.h>
+#include <linux/of_platform.h>
 #include <linux/delay.h>
 #include <linux/skbuff.h>
-#include <linux/rtl8366s.h>
+#include <linux/rtl8366.h>
 
 #include "rtl8366_smi.h"
 
@@ -25,7 +27,6 @@
 #define RTL8366S_PHY_NO_MAX    4
 #define RTL8366S_PHY_PAGE_MAX  7
 #define RTL8366S_PHY_ADDR_MAX  31
-#define RTL8366S_PHY_WAN       4
 
 /* Switch Global Configuration register */
 #define RTL8366S_SGCR                          0x0000
 /* Port Enable Control register */
 #define RTL8366S_PECR                          0x0001
 
+/* Green Ethernet Feature (based on GPL_BELKIN_F5D8235-4_v1000 v1.01.24) */
+#define RTL8366S_GREEN_ETHERNET_CTRL_REG       0x000a
+#define RTL8366S_GREEN_ETHERNET_CTRL_MASK      0x0018
+#define RTL8366S_GREEN_ETHERNET_TX_BIT         (1 << 3)
+#define RTL8366S_GREEN_ETHERNET_RX_BIT         (1 << 4)
+
 /* Switch Security Control registers */
 #define RTL8366S_SSCR0                         0x0002
 #define RTL8366S_SSCR1                         0x0003
 #define RTL8366S_PHY_NO_OFFSET                 9
 #define RTL8366S_PHY_NO_MASK                   (0x1f << 9)
 
+/* Green Ethernet Feature for PHY ports */
+#define RTL8366S_PHY_POWER_SAVING_CTRL_REG     12
+#define RTL8366S_PHY_POWER_SAVING_MASK         0x1000
+
 /* LED control registers */
 #define RTL8366S_LED_BLINKRATE_REG             0x0420
 #define RTL8366S_LED_BLINKRATE_BIT             0
 #define RTL8366S_VLAN_FID_SHIFT                12
 #define RTL8366S_VLAN_FID_MASK         0x7
 
+#define RTL8366S_MIB_RXB_ID            0       /* IfInOctets */
+#define RTL8366S_MIB_TXB_ID            20      /* IfOutOctets */
+
 static struct rtl8366_mib_counter rtl8366s_mib_counters[] = {
        { 0,  0, 4, "IfInOctets"                                },
        { 0,  4, 4, "EtherStatsOctets"                          },
@@ -230,8 +244,8 @@ static int rtl8366s_reset_chip(struct rtl8366_smi *smi)
        int timeout = 10;
        u32 data;
 
-       rtl8366_smi_write_reg(smi, RTL8366S_RESET_CTRL_REG,
-                             RTL8366S_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, RTL8366S_RESET_CTRL_REG, &data))
@@ -249,35 +263,6 @@ static int rtl8366s_reset_chip(struct rtl8366_smi *smi)
        return 0;
 }
 
-static int rtl8366s_hw_init(struct rtl8366_smi *smi)
-{
-       int err;
-
-       /* set maximum packet length to 1536 bytes */
-       REG_RMW(smi, RTL8366S_SGCR, RTL8366S_SGCR_MAX_LENGTH_MASK,
-               RTL8366S_SGCR_MAX_LENGTH_1536);
-
-       /* enable all ports */
-       REG_WR(smi, RTL8366S_PECR, 0);
-
-       /* enable learning for all ports */
-       REG_WR(smi, RTL8366S_SSCR0, 0);
-
-       /* enable auto ageing for all ports */
-       REG_WR(smi, RTL8366S_SSCR1, 0);
-
-       /*
-        * 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, RTL8366S_SSCR2, RTL8366S_SSCR2_DROP_UNKNOWN_DA, 0);
-
-       return 0;
-}
-
 static int rtl8366s_read_phy_reg(struct rtl8366_smi *smi,
                                 u32 phy_no, u32 page, u32 addr, u32 *data)
 {
@@ -344,6 +329,126 @@ static int rtl8366s_write_phy_reg(struct rtl8366_smi *smi,
        return 0;
 }
 
+static int rtl8366s_set_green_port(struct rtl8366_smi *smi, int port, int enable)
+{
+       int err;
+       u32 phyData;
+
+       if (port >= RTL8366S_NUM_PORTS)
+               return -EINVAL;
+
+       err = rtl8366s_read_phy_reg(smi, port, 0, RTL8366S_PHY_POWER_SAVING_CTRL_REG, &phyData);
+       if (err)
+               return err;
+
+       if (enable)
+               phyData |= RTL8366S_PHY_POWER_SAVING_MASK;
+       else
+               phyData &= ~RTL8366S_PHY_POWER_SAVING_MASK;
+
+       err = rtl8366s_write_phy_reg(smi, port, 0, RTL8366S_PHY_POWER_SAVING_CTRL_REG, phyData);
+       if (err)
+               return err;
+
+       return 0;
+}
+
+static int rtl8366s_set_green(struct rtl8366_smi *smi, int enable)
+{
+       int err;
+       unsigned i;
+       u32 data = 0;
+
+       if (!enable) {
+               for (i = 0; i <= RTL8366S_PHY_NO_MAX; i++) {
+                       rtl8366s_set_green_port(smi, i, 0);
+               }
+       }
+
+       if (enable)
+               data = (RTL8366S_GREEN_ETHERNET_TX_BIT | RTL8366S_GREEN_ETHERNET_RX_BIT);
+
+       REG_RMW(smi, RTL8366S_GREEN_ETHERNET_CTRL_REG, RTL8366S_GREEN_ETHERNET_CTRL_MASK, data);
+
+       return 0;
+}
+
+static int rtl8366s_setup(struct rtl8366_smi *smi)
+{
+       struct rtl8366_platform_data *pdata;
+       int err;
+       unsigned i;
+#ifdef CONFIG_OF
+       struct device_node *np;
+       unsigned num_initvals;
+       const __be32 *paddr;
+#endif
+
+       pdata = smi->parent->platform_data;
+       if (pdata && pdata->num_initvals && pdata->initvals) {
+               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);
+       }
+
+#ifdef CONFIG_OF
+       np = smi->parent->of_node;
+
+       paddr = of_get_property(np, "realtek,initvals", &num_initvals);
+       if (paddr) {
+               dev_info(smi->parent, "applying initvals from DTS\n");
+
+               if (num_initvals < (2 * sizeof(*paddr)))
+                       return -EINVAL;
+
+               num_initvals /= sizeof(*paddr);
+
+               for (i = 0; i < num_initvals - 1; i += 2) {
+                       u32 reg = be32_to_cpup(paddr + i);
+                       u32 val = be32_to_cpup(paddr + i + 1);
+
+                       REG_WR(smi, reg, val);
+               }
+       }
+
+       if (of_property_read_bool(np, "realtek,green-ethernet-features")) {
+               dev_info(smi->parent, "activating Green Ethernet features\n");
+
+               err = rtl8366s_set_green(smi, 1);
+               if (err)
+                       return err;
+
+               for (i = 0; i <= RTL8366S_PHY_NO_MAX; i++) {
+                       err = rtl8366s_set_green_port(smi, i, 1);
+                       if (err)
+                               return err;
+               }
+       }
+#endif
+
+       /* set maximum packet length to 1536 bytes */
+       REG_RMW(smi, RTL8366S_SGCR, RTL8366S_SGCR_MAX_LENGTH_MASK,
+               RTL8366S_SGCR_MAX_LENGTH_1536);
+
+       /* enable learning for all ports */
+       REG_WR(smi, RTL8366S_SSCR0, 0);
+
+       /* enable auto ageing for all ports */
+       REG_WR(smi, RTL8366S_SSCR1, 0);
+
+       /*
+        * 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, RTL8366S_SSCR2, RTL8366S_SSCR2_DROP_UNKNOWN_DA, 0);
+
+       return 0;
+}
+
 static int rtl8366_get_mib_counter(struct rtl8366_smi *smi, int counter,
                                   int port, unsigned long long *val)
 {
@@ -455,8 +560,8 @@ static int rtl8366s_set_vlan_4k(struct rtl8366_smi *smi,
        int i;
 
        if (vlan4k->vid >= RTL8366S_NUM_VIDS ||
-           vlan4k->member > RTL8366S_PORT_ALL ||
-           vlan4k->untag > RTL8366S_PORT_ALL ||
+           vlan4k->member > RTL8366S_VLAN_MEMBER_MASK ||
+           vlan4k->untag > RTL8366S_VLAN_UNTAG_MASK ||
            vlan4k->fid > RTL8366S_FIDMAX)
                return -EINVAL;
 
@@ -524,8 +629,8 @@ static int rtl8366s_set_vlan_mc(struct rtl8366_smi *smi, u32 index,
        if (index >= RTL8366S_NUM_VLANS ||
            vlanmc->vid >= RTL8366S_NUM_VIDS ||
            vlanmc->priority > RTL8366S_PRIORITYMAX ||
-           vlanmc->member > RTL8366S_PORT_ALL ||
-           vlanmc->untag > RTL8366S_PORT_ALL ||
+           vlanmc->member > RTL8366S_VLAN_MEMBER_MASK ||
+           vlanmc->untag > RTL8366S_VLAN_UNTAG_MASK ||
            vlanmc->fid > RTL8366S_FIDMAX)
                return -EINVAL;
 
@@ -605,6 +710,12 @@ static int rtl8366s_is_vlan_valid(struct rtl8366_smi *smi, unsigned vlan)
        return 1;
 }
 
+static int rtl8366s_enable_port(struct rtl8366_smi *smi, int port, int enable)
+{
+       return rtl8366_smi_rmwr(smi, RTL8366S_PECR, (1 << port),
+                               (enable) ? 0 : (1 << port));
+}
+
 static int rtl8366s_sw_reset_mibs(struct switch_dev *dev,
                                  const struct switch_attr *attr,
                                  struct switch_val *val)
@@ -642,6 +753,49 @@ static int rtl8366s_sw_set_blinkrate(struct switch_dev *dev,
                                val->value.i);
 }
 
+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);
+
+       return 0;
+}
+
+static int rtl8366s_sw_set_max_length(struct switch_dev *dev,
+                                       const struct switch_attr *attr,
+                                       struct switch_val *val)
+{
+       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 rtl8366_smi_rmwr(smi, RTL8366S_SGCR,
+                       RTL8366S_SGCR_MAX_LENGTH_MASK,
+                       length_code);
+}
+
 static int rtl8366s_sw_get_learning_enable(struct switch_dev *dev,
                                           const struct switch_attr *attr,
                                           struct switch_val *val)
@@ -676,59 +830,73 @@ static int rtl8366s_sw_set_learning_enable(struct switch_dev *dev,
        return 0;
 }
 
+static int rtl8366s_sw_get_green(struct switch_dev *dev,
+                             const struct switch_attr *attr,
+                             struct switch_val *val)
+{
+       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+       u32 data;
+       int err;
+
+       err = rtl8366_smi_read_reg(smi, RTL8366S_GREEN_ETHERNET_CTRL_REG, &data);
+       if (err)
+               return err;
+
+       val->value.i = ((data & (RTL8366S_GREEN_ETHERNET_TX_BIT | RTL8366S_GREEN_ETHERNET_RX_BIT)) != 0) ? 1 : 0;
 
-static const char *rtl8366s_speed_str(unsigned speed)
+       return 0;
+}
+
+static int rtl8366s_sw_set_green(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);
 
-       return "unknown";
+       return rtl8366s_set_green(smi, val->value.i);
 }
 
 static int rtl8366s_sw_get_port_link(struct switch_dev *dev,
-                                    const struct switch_attr *attr,
-                                    struct switch_val *val)
+                                    int port,
+                                    struct switch_port_link *link)
 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-       u32 len = 0, data = 0;
+       u32 data = 0;
+       u32 speed;
 
-       if (val->port_vlan >= RTL8366S_NUM_PORTS)
+       if (port >= RTL8366S_NUM_PORTS)
                return -EINVAL;
 
-       memset(smi->buf, '\0', sizeof(smi->buf));
-       rtl8366_smi_read_reg(smi, RTL8366S_PORT_LINK_STATUS_BASE +
-                            (val->port_vlan / 2), &data);
+       rtl8366_smi_read_reg(smi, RTL8366S_PORT_LINK_STATUS_BASE + (port / 2),
+                            &data);
 
-       if (val->port_vlan % 2)
+       if (port % 2)
                data = data >> 8;
 
-       if (data & RTL8366S_PORT_STATUS_LINK_MASK) {
-               len = snprintf(smi->buf, sizeof(smi->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(smi->buf, sizeof(smi->buf), "port:%d link: down",
-                               val->port_vlan);
-       }
+       link->link = !!(data & RTL8366S_PORT_STATUS_LINK_MASK);
+       if (!link->link)
+               return 0;
 
-       val->value.s = smi->buf;
-       val->len = len;
+       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);
+
+       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;
+       }
 
        return 0;
 }
@@ -775,6 +943,34 @@ static int rtl8366s_sw_get_port_led(struct switch_dev *dev,
        return 0;
 }
 
+static int rtl8366s_sw_get_green_port(struct switch_dev *dev,
+                                     const struct switch_attr *attr,
+                                     struct switch_val *val)
+{
+       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+       int err;
+       u32 phyData;
+
+       if (val->port_vlan >= RTL8366S_NUM_PORTS)
+               return -EINVAL;
+
+       err = rtl8366s_read_phy_reg(smi, val->port_vlan, 0, RTL8366S_PHY_POWER_SAVING_CTRL_REG, &phyData);
+       if (err)
+               return err;
+
+       val->value.i = ((phyData & RTL8366S_PHY_POWER_SAVING_MASK) != 0) ? 1 : 0;
+
+       return 0;
+}
+
+static int rtl8366s_sw_set_green_port(struct switch_dev *dev,
+                                     const struct switch_attr *attr,
+                                     struct switch_val *val)
+{
+       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+       return rtl8366s_set_green_port(smi, val->port_vlan, val->value.i);
+}
+
 static int rtl8366s_sw_reset_port_mibs(struct switch_dev *dev,
                                       const struct switch_attr *attr,
                                       struct switch_val *val)
@@ -789,20 +985,11 @@ static int rtl8366s_sw_reset_port_mibs(struct switch_dev *dev,
                                0, (1 << (val->port_vlan + 3)));
 }
 
-static int rtl8366s_sw_reset_switch(struct switch_dev *dev)
+static int rtl8366s_sw_get_port_stats(struct switch_dev *dev, int port,
+                                        struct switch_port_stats *stats)
 {
-       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-       int err;
-
-       err = rtl8366s_reset_chip(smi);
-       if (err)
-               return err;
-
-       err = rtl8366s_hw_init(smi);
-       if (err)
-               return err;
-
-       return rtl8366_reset_vlan(smi);
+       return (rtl8366_sw_get_port_stats(dev, port, stats,
+                               RTL8366S_MIB_TXB_ID, RTL8366S_MIB_RXB_ID));
 }
 
 static struct switch_attr rtl8366s_globals[] = {
@@ -842,18 +1029,26 @@ 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,
+       }, {
+               .type = SWITCH_TYPE_INT,
+               .name = "green_mode",
+               .description = "Get/Set the router green feature",
+               .set = rtl8366s_sw_set_green,
+               .get = rtl8366s_sw_get_green,
+               .max = 1,
        },
 };
 
 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_NOVAL,
                .name = "reset_mib",
                .description = "Reset single port MIB counters",
@@ -872,6 +1067,13 @@ static struct switch_attr rtl8366s_port[] = {
                .max = 15,
                .set = rtl8366s_sw_set_port_led,
                .get = rtl8366s_sw_get_port_led,
+       }, {
+               .type = SWITCH_TYPE_INT,
+               .name = "green_port",
+               .description = "Get/Set port green feature (0 - 1)",
+               .max = 1,
+               .set = rtl8366s_sw_set_green_port,
+               .get = rtl8366s_sw_get_green_port,
        },
 };
 
@@ -883,6 +1085,13 @@ static struct switch_attr rtl8366s_vlan[] = {
                .max = 1,
                .set = NULL,
                .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,
        },
 };
 
@@ -904,7 +1113,9 @@ static const struct switch_dev_ops rtl8366_ops = {
        .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,
+       .reset_switch = rtl8366_sw_reset_switch,
+       .get_port_link = rtl8366s_sw_get_port_link,
+       .get_port_stats = rtl8366s_sw_get_port_stats,
 };
 
 static int rtl8366s_switch_init(struct rtl8366_smi *smi)
@@ -917,7 +1128,7 @@ static int rtl8366s_switch_init(struct rtl8366_smi *smi)
        dev->ports = RTL8366S_NUM_PORTS;
        dev->vlans = RTL8366S_NUM_VIDS;
        dev->ops = &rtl8366_ops;
-       dev->devname = dev_name(smi->parent);
+       dev->alias = dev_name(smi->parent);
 
        err = register_switch(dev, NULL);
        if (err)
@@ -957,24 +1168,6 @@ 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 rtl8366_smi *smi)
-{
-       int ret;
-
-       ret = rtl8366s_reset_chip(smi);
-       if (ret)
-               return ret;
-
-       ret = rtl8366s_hw_init(smi);
-       return ret;
-}
-
 static int rtl8366s_detect(struct rtl8366_smi *smi)
 {
        u32 chip_id = 0;
@@ -1010,6 +1203,7 @@ static int rtl8366s_detect(struct rtl8366_smi *smi)
 
 static struct rtl8366_smi_ops rtl8366s_smi_ops = {
        .detect         = rtl8366s_detect,
+       .reset_chip     = rtl8366s_reset_chip,
        .setup          = rtl8366s_setup,
 
        .mii_read       = rtl8366s_mii_read,
@@ -1025,12 +1219,12 @@ static struct rtl8366_smi_ops rtl8366s_smi_ops = {
        .is_vlan_valid  = rtl8366s_is_vlan_valid,
        .enable_vlan    = rtl8366s_enable_vlan,
        .enable_vlan4k  = rtl8366s_enable_vlan4k,
+       .enable_port    = rtl8366s_enable_port,
 };
 
-static int __devinit rtl8366s_probe(struct platform_device *pdev)
+static int rtl8366s_probe(struct platform_device *pdev)
 {
        static int rtl8366_smi_version_printed;
-       struct rtl8366s_platform_data *pdata;
        struct rtl8366_smi *smi;
        int err;
 
@@ -1038,21 +1232,13 @@ static int __devinit rtl8366s_probe(struct platform_device *pdev)
                printk(KERN_NOTICE RTL8366S_DRIVER_DESC
                       " version " RTL8366S_DRIVER_VER"\n");
 
-       pdata = pdev->dev.platform_data;
-       if (!pdata) {
-               dev_err(&pdev->dev, "no platform data specified\n");
-               err = -EINVAL;
-               goto err_out;
-       }
-
-       smi = rtl8366_smi_alloc(&pdev->dev);
-       if (!smi) {
-               err = -ENOMEM;
-               goto err_out;
-       }
+       smi = rtl8366_smi_probe(pdev);
+       if (!smi)
+               return -ENODEV;
 
-       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;
@@ -1077,41 +1263,10 @@ static int __devinit rtl8366s_probe(struct platform_device *pdev)
        rtl8366_smi_cleanup(smi);
  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)
-{
-       /* phy 4 might be connected to a second mac, allow aneg config */
-       if (phydev->addr == RTL8366S_PHY_WAN)
-               return genphy_config_aneg(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)
+static int rtl8366s_remove(struct platform_device *pdev)
 {
        struct rtl8366_smi *smi = platform_get_drvdata(pdev);
 
@@ -1125,37 +1280,34 @@ static int __devexit rtl8366s_remove(struct platform_device *pdev)
        return 0;
 }
 
+#ifdef CONFIG_OF
+static const struct of_device_id rtl8366s_match[] = {
+       { .compatible = "realtek,rtl8366s" },
+       {},
+};
+MODULE_DEVICE_TABLE(of, rtl8366s_match);
+#endif
+
 static struct platform_driver rtl8366s_driver = {
        .driver = {
                .name           = RTL8366S_DRIVER_NAME,
                .owner          = THIS_MODULE,
+#ifdef CONFIG_OF
+               .of_match_table = of_match_ptr(rtl8366s_match),
+#endif
        },
        .probe          = rtl8366s_probe,
-       .remove         = __devexit_p(rtl8366s_remove),
+       .remove         = rtl8366s_remove,
 };
 
 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);