generic: drop outdated kernel version switches in local drivers
[oweals/openwrt.git] / target / linux / generic / files / drivers / net / phy / rtl8366_smi.c
index 9b70a9282a9b322e3ceba8a99da3d0f2a0250d26..e8375e514787e61302f34051b49a257539d220c4 100644 (file)
 #include <linux/gpio.h>
 #include <linux/spinlock.h>
 #include <linux/skbuff.h>
-
-#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
+#include <linux/of.h>
+#include <linux/of_platform.h>
+#include <linux/of_gpio.h>
+#include <linux/rtl8366.h>
+#include <linux/version.h>
+#include <linux/of_mdio.h>
+
+#ifdef CONFIG_RTL8366_SMI_DEBUG_FS
 #include <linux/debugfs.h>
 #endif
 
 #include "rtl8366_smi.h"
 
 #define RTL8366_SMI_ACK_RETRY_COUNT         5
-#define RTL8366_SMI_CLK_DELAY               10 /* nsec */
+
+#define RTL8366_SMI_HW_STOP_DELAY              25      /* msecs */
+#define RTL8366_SMI_HW_START_DELAY             100     /* msecs */
 
 static inline void rtl8366_smi_clk_delay(struct rtl8366_smi *smi)
 {
-       ndelay(RTL8366_SMI_CLK_DELAY);
+       ndelay(smi->clk_delay);
 }
 
 static void rtl8366_smi_start(struct rtl8366_smi *smi)
@@ -142,8 +150,10 @@ static int rtl8366_smi_wait_for_ack(struct rtl8366_smi *smi)
                if (ack == 0)
                        break;
 
-               if (++retry_cnt > RTL8366_SMI_ACK_RETRY_COUNT)
-                       return -EIO;
+               if (++retry_cnt > RTL8366_SMI_ACK_RETRY_COUNT) {
+                       dev_err(smi->parent, "ACK timeout\n");
+                       return -ETIMEDOUT;
+               }
        } while (1);
 
        return 0;
@@ -155,6 +165,12 @@ static int rtl8366_smi_write_byte(struct rtl8366_smi *smi, u8 data)
        return rtl8366_smi_wait_for_ack(smi);
 }
 
+static int rtl8366_smi_write_byte_noack(struct rtl8366_smi *smi, u8 data)
+{
+       rtl8366_smi_write_bits(smi, data, 8);
+       return 0;
+}
+
 static int rtl8366_smi_read_byte0(struct rtl8366_smi *smi, u8 *data)
 {
        u32 t;
@@ -183,7 +199,7 @@ static int rtl8366_smi_read_byte1(struct rtl8366_smi *smi, u8 *data)
        return 0;
 }
 
-int rtl8366_smi_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data)
+static int __rtl8366_smi_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data)
 {
        unsigned long flags;
        u8 lo = 0;
@@ -195,7 +211,7 @@ int rtl8366_smi_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data)
        rtl8366_smi_start(smi);
 
        /* send READ command */
-       ret = rtl8366_smi_write_byte(smi, 0x0a << 4 | 0x04 << 1 | 0x01);
+       ret = rtl8366_smi_write_byte(smi, smi->cmd_read);
        if (ret)
                goto out;
 
@@ -224,9 +240,105 @@ int rtl8366_smi_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data)
 
        return ret;
 }
+/* Read/write via mdiobus */
+#define MDC_MDIO_CTRL0_REG             31
+#define MDC_MDIO_START_REG             29
+#define MDC_MDIO_CTRL1_REG             21
+#define MDC_MDIO_ADDRESS_REG           23
+#define MDC_MDIO_DATA_WRITE_REG                24
+#define MDC_MDIO_DATA_READ_REG         25
+
+#define MDC_MDIO_START_OP              0xFFFF
+#define MDC_MDIO_ADDR_OP               0x000E
+#define MDC_MDIO_READ_OP               0x0001
+#define MDC_MDIO_WRITE_OP              0x0003
+#define MDC_REALTEK_PHY_ADDR           0x0
+
+int __rtl8366_mdio_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data)
+{
+       u32 phy_id = MDC_REALTEK_PHY_ADDR;
+       struct mii_bus *mbus = smi->ext_mbus;
+
+       BUG_ON(in_interrupt());
+
+       mutex_lock(&mbus->mdio_lock);
+       /* Write Start command to register 29 */
+       mbus->write(mbus, phy_id, MDC_MDIO_START_REG, MDC_MDIO_START_OP);
+
+       /* Write address control code to register 31 */
+       mbus->write(mbus, phy_id, MDC_MDIO_CTRL0_REG, MDC_MDIO_ADDR_OP);
+
+       /* Write Start command to register 29 */
+       mbus->write(mbus, phy_id, MDC_MDIO_START_REG, MDC_MDIO_START_OP);
+
+       /* Write address to register 23 */
+       mbus->write(mbus, phy_id, MDC_MDIO_ADDRESS_REG, addr);
+
+       /* Write Start command to register 29 */
+       mbus->write(mbus, phy_id, MDC_MDIO_START_REG, MDC_MDIO_START_OP);
+
+       /* Write read control code to register 21 */
+       mbus->write(mbus, phy_id, MDC_MDIO_CTRL1_REG, MDC_MDIO_READ_OP);
+
+       /* Write Start command to register 29 */
+       mbus->write(smi->ext_mbus, phy_id, MDC_MDIO_START_REG, MDC_MDIO_START_OP);
+
+       /* Read data from register 25 */
+       *data = mbus->read(mbus, phy_id, MDC_MDIO_DATA_READ_REG);
+
+       mutex_unlock(&mbus->mdio_lock);
+
+       return 0;
+}
+
+static int __rtl8366_mdio_write_reg(struct rtl8366_smi *smi, u32 addr, u32 data)
+{
+       u32 phy_id = MDC_REALTEK_PHY_ADDR;
+       struct mii_bus *mbus = smi->ext_mbus;
+
+       BUG_ON(in_interrupt());
+
+       mutex_lock(&mbus->mdio_lock);
+
+       /* Write Start command to register 29 */
+       mbus->write(mbus, phy_id, MDC_MDIO_START_REG, MDC_MDIO_START_OP);
+
+       /* Write address control code to register 31 */
+       mbus->write(mbus, phy_id, MDC_MDIO_CTRL0_REG, MDC_MDIO_ADDR_OP);
+
+       /* Write Start command to register 29 */
+       mbus->write(mbus, phy_id, MDC_MDIO_START_REG, MDC_MDIO_START_OP);
+
+       /* Write address to register 23 */
+       mbus->write(mbus, phy_id, MDC_MDIO_ADDRESS_REG, addr);
+
+       /* Write Start command to register 29 */
+       mbus->write(mbus, phy_id, MDC_MDIO_START_REG, MDC_MDIO_START_OP);
+
+       /* Write data to register 24 */
+       mbus->write(mbus, phy_id, MDC_MDIO_DATA_WRITE_REG, data);
+
+       /* Write Start command to register 29 */
+       mbus->write(mbus, phy_id, MDC_MDIO_START_REG, MDC_MDIO_START_OP);
+
+       /* Write data control code to register 21 */
+       mbus->write(mbus, phy_id, MDC_MDIO_CTRL1_REG, MDC_MDIO_WRITE_OP);
+
+       mutex_unlock(&mbus->mdio_lock);
+       return 0;
+}
+
+int rtl8366_smi_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data)
+{
+       if (smi->ext_mbus)
+               return __rtl8366_mdio_read_reg(smi, addr, data);
+       else
+               return __rtl8366_smi_read_reg(smi, addr, data);
+}
 EXPORT_SYMBOL_GPL(rtl8366_smi_read_reg);
 
-int rtl8366_smi_write_reg(struct rtl8366_smi *smi, u32 addr, u32 data)
+static int __rtl8366_smi_write_reg(struct rtl8366_smi *smi,
+                                  u32 addr, u32 data, bool ack)
 {
        unsigned long flags;
        int ret;
@@ -236,7 +348,7 @@ int rtl8366_smi_write_reg(struct rtl8366_smi *smi, u32 addr, u32 data)
        rtl8366_smi_start(smi);
 
        /* send WRITE command */
-       ret = rtl8366_smi_write_byte(smi, 0x0a << 4 | 0x04 << 1 | 0x00);
+       ret = rtl8366_smi_write_byte(smi, smi->cmd_write);
        if (ret)
                goto out;
 
@@ -256,7 +368,10 @@ int rtl8366_smi_write_reg(struct rtl8366_smi *smi, u32 addr, u32 data)
                goto out;
 
        /* write DATA[15:8] */
-       ret = rtl8366_smi_write_byte(smi, data >> 8);
+       if (ack)
+               ret = rtl8366_smi_write_byte(smi, data >> 8);
+       else
+               ret = rtl8366_smi_write_byte_noack(smi, data >> 8);
        if (ret)
                goto out;
 
@@ -268,8 +383,22 @@ int rtl8366_smi_write_reg(struct rtl8366_smi *smi, u32 addr, u32 data)
 
        return ret;
 }
+
+int rtl8366_smi_write_reg(struct rtl8366_smi *smi, u32 addr, u32 data)
+{
+       if (smi->ext_mbus)
+               return __rtl8366_mdio_write_reg(smi, addr, data);
+       else
+               return __rtl8366_smi_write_reg(smi, addr, data, true);
+}
 EXPORT_SYMBOL_GPL(rtl8366_smi_write_reg);
 
+int rtl8366_smi_write_reg_noack(struct rtl8366_smi *smi, u32 addr, u32 data)
+{
+       return __rtl8366_smi_write_reg(smi, addr, data, false);
+}
+EXPORT_SYMBOL_GPL(rtl8366_smi_write_reg_noack);
+
 int rtl8366_smi_rmwr(struct rtl8366_smi *smi, u32 addr, u32 mask, u32 data)
 {
        u32 t;
@@ -285,6 +414,19 @@ int rtl8366_smi_rmwr(struct rtl8366_smi *smi, u32 addr, u32 mask, u32 data)
 }
 EXPORT_SYMBOL_GPL(rtl8366_smi_rmwr);
 
+static int rtl8366_reset(struct rtl8366_smi *smi)
+{
+       if (smi->hw_reset) {
+               smi->hw_reset(smi, true);
+               msleep(RTL8366_SMI_HW_STOP_DELAY);
+               smi->hw_reset(smi, false);
+               msleep(RTL8366_SMI_HW_START_DELAY);
+               return 0;
+       }
+
+       return smi->ops->reset_chip(smi);
+}
+
 static int rtl8366_mc_is_used(struct rtl8366_smi *smi, int mc_index, int *used)
 {
        int err;
@@ -448,7 +590,7 @@ static int rtl8366_set_pvid(struct rtl8366_smi *smi, unsigned port,
        return -ENOSPC;
 }
 
-static int rtl8366_enable_vlan(struct rtl8366_smi *smi, int enable)
+int rtl8366_enable_vlan(struct rtl8366_smi *smi, int enable)
 {
        int err;
 
@@ -465,6 +607,7 @@ static int rtl8366_enable_vlan(struct rtl8366_smi *smi, int enable)
 
        return err;
 }
+EXPORT_SYMBOL_GPL(rtl8366_enable_vlan);
 
 static int rtl8366_enable_vlan4k(struct rtl8366_smi *smi, int enable)
 {
@@ -486,6 +629,21 @@ static int rtl8366_enable_vlan4k(struct rtl8366_smi *smi, int enable)
        return 0;
 }
 
+int rtl8366_enable_all_ports(struct rtl8366_smi *smi, int enable)
+{
+       int port;
+       int err;
+
+       for (port = 0; port < smi->num_ports; port++) {
+               err = smi->ops->enable_port(smi, port, enable);
+               if (err)
+                       return err;
+       }
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(rtl8366_enable_all_ports);
+
 int rtl8366_reset_vlan(struct rtl8366_smi *smi)
 {
        struct rtl8366_vlan_mc vlanmc;
@@ -507,27 +665,40 @@ int rtl8366_reset_vlan(struct rtl8366_smi *smi)
                        return err;
        }
 
-       for (i = 0; i < smi->num_ports; i++) {
-               if (i == smi->cpu_port)
-                       continue;
+       return 0;
+}
+EXPORT_SYMBOL_GPL(rtl8366_reset_vlan);
+
+static int rtl8366_init_vlan(struct rtl8366_smi *smi)
+{
+       int port;
+       int err;
 
-               err = rtl8366_set_vlan(smi, (i + 1),
-                                       (1 << i) | (1 << smi->cpu_port),
-                                       (1 << i) | (1 << smi->cpu_port),
-                                       0);
+       err = rtl8366_reset_vlan(smi);
+       if (err)
+               return err;
+
+       for (port = 0; port < smi->num_ports; port++) {
+               u32 mask;
+
+               if (port == smi->cpu_port)
+                       mask = (1 << smi->num_ports) - 1;
+               else
+                       mask = (1 << port) | (1 << smi->cpu_port);
+
+               err = rtl8366_set_vlan(smi, (port + 1), mask, mask, 0);
                if (err)
                        return err;
 
-               err = rtl8366_set_pvid(smi, i, (i + 1));
+               err = rtl8366_set_pvid(smi, port, (port + 1));
                if (err)
                        return err;
        }
 
-       return 0;
+       return rtl8366_enable_vlan(smi, 1);
 }
-EXPORT_SYMBOL_GPL(rtl8366_reset_vlan);
 
-#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
+#ifdef CONFIG_RTL8366_SMI_DEBUG_FS
 int rtl8366_debugfs_open(struct inode *inode, struct file *file)
 {
        file->private_data = inode->i_private;
@@ -561,6 +732,43 @@ static ssize_t rtl8366_read_debugfs_vlan_mc(struct file *file,
        return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }
 
+#define RTL8366_VLAN4K_PAGE_SIZE       64
+#define RTL8366_VLAN4K_NUM_PAGES       (4096 / RTL8366_VLAN4K_PAGE_SIZE)
+
+static ssize_t rtl8366_read_debugfs_vlan_4k(struct file *file,
+                                           char __user *user_buf,
+                                           size_t count, loff_t *ppos)
+{
+       struct rtl8366_smi *smi = (struct rtl8366_smi *)file->private_data;
+       int i, len = 0;
+       int offset;
+       char *buf = smi->buf;
+
+       if (smi->dbg_vlan_4k_page >= RTL8366_VLAN4K_NUM_PAGES) {
+               len += snprintf(buf + len, sizeof(smi->buf) - len,
+                               "invalid page: %u\n", smi->dbg_vlan_4k_page);
+               return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+       }
+
+       len += snprintf(buf + len, sizeof(smi->buf) - len,
+                       "%4s %6s %6s %3s\n",
+                       "vid", "member", "untag", "fid");
+
+       offset = RTL8366_VLAN4K_PAGE_SIZE * smi->dbg_vlan_4k_page;
+       for (i = 0; i < RTL8366_VLAN4K_PAGE_SIZE; i++) {
+               struct rtl8366_vlan_4k vlan4k;
+
+               smi->ops->get_vlan_4k(smi, offset + i, &vlan4k);
+
+               len += snprintf(buf + len, sizeof(smi->buf) - len,
+                               "%4d 0x%04x 0x%04x %3d\n",
+                               vlan4k.vid, vlan4k.member,
+                               vlan4k.untag, vlan4k.fid);
+       }
+
+       return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+}
+
 static ssize_t rtl8366_read_debugfs_pvid(struct file *file,
                                         char __user *user_buf,
                                         size_t count, loff_t *ppos)
@@ -635,7 +843,7 @@ static ssize_t rtl8366_write_debugfs_reg(struct file *file,
                buf[len - 1] = '\0';
 
 
-       if (strict_strtoul(buf, 16, &data)) {
+       if (kstrtoul(buf, 16, &data)) {
                dev_err(smi->parent, "Invalid reg value %s\n", buf);
        } else {
                err = rtl8366_smi_write_reg(smi, reg, data);
@@ -703,6 +911,12 @@ static const struct file_operations fops_rtl8366_vlan_mc = {
        .owner  = THIS_MODULE
 };
 
+static const struct file_operations fops_rtl8366_vlan_4k = {
+       .read   = rtl8366_read_debugfs_vlan_4k,
+       .open   = rtl8366_debugfs_open,
+       .owner  = THIS_MODULE
+};
+
 static const struct file_operations fops_rtl8366_pvid = {
        .read   = rtl8366_read_debugfs_pvid,
        .open   = rtl8366_debugfs_open,
@@ -754,6 +968,22 @@ static void rtl8366_debugfs_init(struct rtl8366_smi *smi)
                return;
        }
 
+       node = debugfs_create_u8("vlan_4k_page", S_IRUGO | S_IWUSR, root,
+                                 &smi->dbg_vlan_4k_page);
+       if (!node) {
+               dev_err(smi->parent, "Creating debugfs file '%s' failed\n",
+                       "vlan_4k_page");
+               return;
+       }
+
+       node = debugfs_create_file("vlan_4k", S_IRUSR, root, smi,
+                                  &fops_rtl8366_vlan_4k);
+       if (!node) {
+               dev_err(smi->parent, "Creating debugfs file '%s' failed\n",
+                       "vlan_4k");
+               return;
+       }
+
        node = debugfs_create_file("pvid", S_IRUSR, root, smi,
                                   &fops_rtl8366_pvid);
        if (!node) {
@@ -779,12 +1009,17 @@ static void rtl8366_debugfs_remove(struct rtl8366_smi *smi)
 #else
 static inline void rtl8366_debugfs_init(struct rtl8366_smi *smi) {}
 static inline void rtl8366_debugfs_remove(struct rtl8366_smi *smi) {}
-#endif /* CONFIG_RTL8366S_PHY_DEBUG_FS */
+#endif /* CONFIG_RTL8366_SMI_DEBUG_FS */
 
 static int rtl8366_smi_mii_init(struct rtl8366_smi *smi)
 {
        int ret;
-       int i;
+
+#ifdef CONFIG_OF
+       struct device_node *np = NULL;
+
+       np = of_get_child_by_name(smi->parent->of_node, "mdio-bus");
+#endif
 
        smi->mii_bus = mdiobus_alloc();
        if (smi->mii_bus == NULL) {
@@ -800,11 +1035,14 @@ static int rtl8366_smi_mii_init(struct rtl8366_smi *smi)
                 dev_name(smi->parent));
        smi->mii_bus->parent = smi->parent;
        smi->mii_bus->phy_mask = ~(0x1f);
-       smi->mii_bus->irq = smi->mii_irq;
-       for (i = 0; i < PHY_MAX_ADDR; i++)
-               smi->mii_irq[i] = PHY_POLL;
 
-       ret = mdiobus_register(smi->mii_bus);
+#ifdef CONFIG_OF
+       if (np)
+               ret = of_mdiobus_register(smi->mii_bus, np);
+       else
+#endif
+               ret = mdiobus_register(smi->mii_bus);
+
        if (ret)
                goto err_free;
 
@@ -822,6 +1060,31 @@ static void rtl8366_smi_mii_cleanup(struct rtl8366_smi *smi)
        mdiobus_free(smi->mii_bus);
 }
 
+int rtl8366_sw_reset_switch(struct switch_dev *dev)
+{
+       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+       int err;
+
+       err = rtl8366_reset(smi);
+       if (err)
+               return err;
+
+       err = smi->ops->setup(smi);
+       if (err)
+               return err;
+
+       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);
+}
+EXPORT_SYMBOL_GPL(rtl8366_sw_reset_switch);
+
 int rtl8366_sw_get_port_pvid(struct switch_dev *dev, int port, int *val)
 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
@@ -870,6 +1133,33 @@ int rtl8366_sw_get_port_mib(struct switch_dev *dev,
 }
 EXPORT_SYMBOL_GPL(rtl8366_sw_get_port_mib);
 
+int rtl8366_sw_get_port_stats(struct switch_dev *dev, int port,
+                               struct switch_port_stats *stats,
+                               int txb_id, int rxb_id)
+{
+       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+       unsigned long long counter = 0;
+       int ret;
+
+       if (port >= smi->num_ports)
+               return -EINVAL;
+
+       ret = smi->ops->get_mib_counter(smi, txb_id, port, &counter);
+       if (ret)
+               return ret;
+
+       stats->tx_bytes = counter;
+
+       ret = smi->ops->get_mib_counter(smi, rxb_id, port, &counter);
+       if (ret)
+               return ret;
+
+       stats->rx_bytes = counter;
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(rtl8366_sw_get_port_stats);
+
 int rtl8366_sw_get_vlan_info(struct switch_dev *dev,
                             const struct switch_attr *attr,
                             struct switch_val *val)
@@ -946,6 +1236,7 @@ int rtl8366_sw_set_vlan_ports(struct switch_dev *dev, struct switch_val *val)
        struct switch_port *port;
        u32 member = 0;
        u32 untag = 0;
+       int err;
        int i;
 
        if (!smi->ops->is_vlan_valid(smi, val->port_vlan))
@@ -953,16 +1244,76 @@ int rtl8366_sw_set_vlan_ports(struct switch_dev *dev, struct switch_val *val)
 
        port = &val->value.ports[0];
        for (i = 0; i < val->len; i++, port++) {
+               int pvid = 0;
                member |= BIT(port->id);
 
                if (!(port->flags & BIT(SWITCH_PORT_FLAG_TAGGED)))
                        untag |= BIT(port->id);
+
+               /*
+                * To ensure that we have a valid MC entry for this VLAN,
+                * initialize the port VLAN ID here.
+                */
+               err = rtl8366_get_pvid(smi, port->id, &pvid);
+               if (err < 0)
+                       return err;
+               if (pvid == 0) {
+                       err = rtl8366_set_pvid(smi, port->id, val->port_vlan);
+                       if (err < 0)
+                               return err;
+               }
        }
 
        return rtl8366_set_vlan(smi, val->port_vlan, member, untag, 0);
 }
 EXPORT_SYMBOL_GPL(rtl8366_sw_set_vlan_ports);
 
+int rtl8366_sw_get_vlan_fid(struct switch_dev *dev,
+                           const struct switch_attr *attr,
+                           struct switch_val *val)
+{
+       struct rtl8366_vlan_4k vlan4k;
+       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+       int err;
+
+       if (!smi->ops->is_vlan_valid(smi, val->port_vlan))
+               return -EINVAL;
+
+       err = smi->ops->get_vlan_4k(smi, val->port_vlan, &vlan4k);
+       if (err)
+               return err;
+
+       val->value.i = vlan4k.fid;
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(rtl8366_sw_get_vlan_fid);
+
+int rtl8366_sw_set_vlan_fid(struct switch_dev *dev,
+                           const struct switch_attr *attr,
+                           struct switch_val *val)
+{
+       struct rtl8366_vlan_4k vlan4k;
+       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+       int err;
+
+       if (!smi->ops->is_vlan_valid(smi, val->port_vlan))
+               return -EINVAL;
+
+       if (val->value.i < 0 || val->value.i > attr->max)
+               return -EINVAL;
+
+       err = smi->ops->get_vlan_4k(smi, val->port_vlan, &vlan4k);
+       if (err)
+               return err;
+
+       return rtl8366_set_vlan(smi, val->port_vlan,
+                               vlan4k.member,
+                               vlan4k.untag,
+                               val->value.i);
+}
+EXPORT_SYMBOL_GPL(rtl8366_sw_set_vlan_fid);
+
 int rtl8366_sw_get_vlan_enable(struct switch_dev *dev,
                               const struct switch_attr *attr,
                               struct switch_val *val)
@@ -1017,31 +1368,108 @@ struct rtl8366_smi *rtl8366_smi_alloc(struct device *parent)
 }
 EXPORT_SYMBOL_GPL(rtl8366_smi_alloc);
 
-int rtl8366_smi_init(struct rtl8366_smi *smi)
+static int __rtl8366_smi_init(struct rtl8366_smi *smi, const char *name)
 {
        int err;
 
-       if (!smi->ops)
-               return -EINVAL;
+       if (!smi->ext_mbus) {
+               err = gpio_request(smi->gpio_sda, name);
+               if (err) {
+                       printk(KERN_ERR "rtl8366_smi: gpio_request failed for %u, err=%d\n",
+                               smi->gpio_sda, err);
+                       goto err_out;
+               }
 
-       err = gpio_request(smi->gpio_sda, dev_name(smi->parent));
-       if (err) {
-               dev_err(smi->parent, "gpio_request failed for %u, err=%d\n",
-                       smi->gpio_sda, err);
-               goto err_out;
+               err = gpio_request(smi->gpio_sck, name);
+               if (err) {
+                       printk(KERN_ERR "rtl8366_smi: gpio_request failed for %u, err=%d\n",
+                               smi->gpio_sck, err);
+                       goto err_free_sda;
+               }
        }
 
-       err = gpio_request(smi->gpio_sck, dev_name(smi->parent));
-       if (err) {
-               dev_err(smi->parent, "gpio_request failed for %u, err=%d\n",
-                       smi->gpio_sck, err);
-               goto err_free_sda;
+       spin_lock_init(&smi->lock);
+
+       /* start the switch */
+       if (smi->hw_reset) {
+               smi->hw_reset(smi, false);
+               msleep(RTL8366_SMI_HW_START_DELAY);
        }
 
-       spin_lock_init(&smi->lock);
+       return 0;
 
-       dev_info(smi->parent, "using GPIO pins %u (SDA) and %u (SCK)\n",
-                smi->gpio_sda, smi->gpio_sck);
+ err_free_sda:
+       gpio_free(smi->gpio_sda);
+ err_out:
+       return err;
+}
+
+static void __rtl8366_smi_cleanup(struct rtl8366_smi *smi)
+{
+       if (smi->hw_reset)
+               smi->hw_reset(smi, true);
+
+       if (!smi->ext_mbus) {
+               gpio_free(smi->gpio_sck);
+               gpio_free(smi->gpio_sda);
+       }
+}
+
+enum rtl8366_type rtl8366_smi_detect(struct rtl8366_platform_data *pdata)
+{
+       static struct rtl8366_smi smi;
+       enum rtl8366_type type = RTL8366_TYPE_UNKNOWN;
+       u32 reg = 0;
+
+       memset(&smi, 0, sizeof(smi));
+       smi.gpio_sda = pdata->gpio_sda;
+       smi.gpio_sck = pdata->gpio_sck;
+       smi.clk_delay = 10;
+       smi.cmd_read  = 0xa9;
+       smi.cmd_write = 0xa8;
+
+       if (__rtl8366_smi_init(&smi, "rtl8366"))
+               goto out;
+
+       if (rtl8366_smi_read_reg(&smi, 0x5c, &reg))
+               goto cleanup;
+
+       switch(reg) {
+       case 0x6027:
+               printk("Found an RTL8366S switch\n");
+               type = RTL8366_TYPE_S;
+               break;
+       case 0x5937:
+               printk("Found an RTL8366RB switch\n");
+               type = RTL8366_TYPE_RB;
+               break;
+       default:
+               printk("Found an Unknown RTL8366 switch (id=0x%04x)\n", reg);
+               break;
+       }
+
+cleanup:
+       __rtl8366_smi_cleanup(&smi);
+out:
+       return type;
+}
+
+int rtl8366_smi_init(struct rtl8366_smi *smi)
+{
+       int err;
+
+       if (!smi->ops)
+               return -EINVAL;
+
+       err = __rtl8366_smi_init(smi, dev_name(smi->parent));
+       if (err)
+               goto err_out;
+
+       if (!smi->ext_mbus)
+               dev_info(smi->parent, "using GPIO pins %u (SDA) and %u (SCK)\n",
+                        smi->gpio_sda, smi->gpio_sck);
+       else
+               dev_info(smi->parent, "using MDIO bus '%s'\n", smi->ext_mbus->name);
 
        err = smi->ops->detect(smi);
        if (err) {
@@ -1049,12 +1477,27 @@ int rtl8366_smi_init(struct rtl8366_smi *smi)
                goto err_free_sck;
        }
 
+       err = rtl8366_reset(smi);
+       if (err)
+               goto err_free_sck;
+
        err = smi->ops->setup(smi);
        if (err) {
                dev_err(smi->parent, "chip setup failed, err=%d\n", err);
                goto err_free_sck;
        }
 
+       err = rtl8366_init_vlan(smi);
+       if (err) {
+               dev_err(smi->parent, "VLAN initialization failed, err=%d\n",
+                       err);
+               goto err_free_sck;
+       }
+
+       err = rtl8366_enable_all_ports(smi, 1);
+       if (err)
+               goto err_free_sck;
+
        err = rtl8366_smi_mii_init(smi);
        if (err)
                goto err_free_sck;
@@ -1064,9 +1507,7 @@ int rtl8366_smi_init(struct rtl8366_smi *smi)
        return 0;
 
  err_free_sck:
-       gpio_free(smi->gpio_sck);
- err_free_sda:
-       gpio_free(smi->gpio_sda);
+       __rtl8366_smi_cleanup(smi);
  err_out:
        return err;
 }
@@ -1076,11 +1517,108 @@ void rtl8366_smi_cleanup(struct rtl8366_smi *smi)
 {
        rtl8366_debugfs_remove(smi);
        rtl8366_smi_mii_cleanup(smi);
-       gpio_free(smi->gpio_sck);
-       gpio_free(smi->gpio_sda);
+       __rtl8366_smi_cleanup(smi);
 }
 EXPORT_SYMBOL_GPL(rtl8366_smi_cleanup);
 
+#ifdef CONFIG_OF
+static void rtl8366_smi_reset(struct rtl8366_smi *smi, bool active)
+{
+       if (active)
+               reset_control_assert(smi->reset);
+       else
+               reset_control_deassert(smi->reset);
+}
+
+int rtl8366_smi_probe_of(struct platform_device *pdev, struct rtl8366_smi *smi)
+{
+       int sck = of_get_named_gpio(pdev->dev.of_node, "gpio-sck", 0);
+       int sda = of_get_named_gpio(pdev->dev.of_node, "gpio-sda", 0);
+       struct device_node *np = pdev->dev.of_node;
+       struct device_node *mdio_node;
+
+       mdio_node = of_parse_phandle(np, "mii-bus", 0);
+       if (!mdio_node) {
+               dev_err(&pdev->dev, "cannot find mdio node phandle");
+               goto try_gpio;
+       }
+
+       smi->ext_mbus = of_mdio_find_bus(mdio_node);
+       if (!smi->ext_mbus) {
+               dev_info(&pdev->dev,
+                       "cannot find mdio bus from bus handle (yet)");
+               goto try_gpio;
+       }
+
+       return 0;
+
+try_gpio:
+       if (!gpio_is_valid(sck) || !gpio_is_valid(sda)) {
+               if (!mdio_node) {
+                       dev_err(&pdev->dev, "gpios missing in devictree\n");
+                       return -EINVAL;
+               } else {
+                       return -EPROBE_DEFER;
+               }
+       }
+
+       smi->gpio_sda = sda;
+       smi->gpio_sck = sck;
+       smi->reset = devm_reset_control_get(&pdev->dev, "switch");
+       if (!IS_ERR(smi->reset))
+               smi->hw_reset = rtl8366_smi_reset;
+
+       return 0;
+}
+#else
+static inline int rtl8366_smi_probe_of(struct platform_device *pdev, struct rtl8366_smi *smi)
+{
+       return -ENODEV;
+}
+#endif
+
+int rtl8366_smi_probe_plat(struct platform_device *pdev, struct rtl8366_smi *smi)
+{
+       struct rtl8366_platform_data *pdata = pdev->dev.platform_data;
+
+       if (!pdev->dev.platform_data) {
+               dev_err(&pdev->dev, "no platform data specified\n");
+               return -EINVAL;
+       }
+
+       smi->gpio_sda = pdata->gpio_sda;
+       smi->gpio_sck = pdata->gpio_sck;
+       smi->hw_reset = pdata->hw_reset;
+
+       return 0;
+}
+
+
+struct rtl8366_smi *rtl8366_smi_probe(struct platform_device *pdev)
+{
+       struct rtl8366_smi *smi;
+       int err;
+
+       smi = rtl8366_smi_alloc(&pdev->dev);
+       if (!smi)
+               return NULL;
+
+       if (pdev->dev.of_node)
+               err = rtl8366_smi_probe_of(pdev, smi);
+       else
+               err = rtl8366_smi_probe_plat(pdev, smi);
+
+       if (err)
+               goto free_smi;
+
+       return smi;
+
+free_smi:
+       kfree(smi);
+       return ERR_PTR(err);
+}
+EXPORT_SYMBOL_GPL(rtl8366_smi_probe);
+
 MODULE_DESCRIPTION("Realtek RTL8366 SMI interface driver");
 MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
 MODULE_LICENSE("GPL v2");