X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/6938bc08dfa57eff5a2b479099e996389b18c900..9044daabf76946a3e02bfbe33920796f5a495136:/target/linux/generic/files/drivers/net/phy/rtl8366s.c

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366s.c b/target/linux/generic/files/drivers/net/phy/rtl8366s.c
index 7ed6c5fc1..7f9680aa1 100644
--- a/target/linux/generic/files/drivers/net/phy/rtl8366s.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366s.c
@@ -15,7 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/skbuff.h>
-#include <linux/rtl8366s.h>
+#include <linux/rtl8366.h>
 
 #include "rtl8366_smi.h"
 
@@ -229,8 +229,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))
@@ -250,20 +250,28 @@ 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, 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);
 
-	/* disable learning for all ports */
-	REG_WR(smi, RTL8366S_SSCR0, RTL8366S_PORT_ALL);
-
-	/* disable auto ageing for all ports */
-	REG_WR(smi, RTL8366S_SSCR1, RTL8366S_PORT_ALL);
+	/* enable auto ageing for all ports */
+	REG_WR(smi, RTL8366S_SSCR1, 0);
 
 	/*
 	 * discard VLAN tagged packets if the port is not a member of
@@ -454,8 +462,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;
 
@@ -523,8 +531,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;
 
@@ -579,51 +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_vlan_set_vlan(struct rtl8366_smi *smi, int enable)
+static int rtl8366s_enable_vlan(struct rtl8366_smi *smi, int enable)
 {
 	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_sw_reset_mibs(struct switch_dev *dev,
-				  const struct switch_attr *attr,
-				  struct switch_val *val)
+static int rtl8366s_is_vlan_valid(struct rtl8366_smi *smi, unsigned vlan)
 {
-	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+	unsigned max = RTL8366S_NUM_VLANS;
 
-	return rtl8366_smi_rmwr(smi, RTL8366S_MIB_CTRL_REG, 0, (1 << 2));
-}
+	if (smi->vlan4k_enabled)
+		max = RTL8366S_NUM_VIDS - 1;
 
-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 (vlan == 0 || vlan >= max)
+		return 0;
 
-	if (attr->ofs == 1) {
-		rtl8366_smi_read_reg(smi, RTL8366S_SGCR, &data);
+	return 1;
+}
 
-		if (data & RTL8366S_SGCR_EN_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);
+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));
+}
 
-		if (data & 0x0001)
-			val->value.i = 1;
-		else
-			val->value.i = 0;
-	}
+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);
 
-	return 0;
+	return rtl8366_smi_rmwr(smi, RTL8366S_MIB_CTRL_REG, 0, (1 << 2));
 }
 
 static int rtl8366s_sw_get_blinkrate(struct switch_dev *dev,
@@ -654,112 +655,125 @@ static int rtl8366s_sw_set_blinkrate(struct switch_dev *dev,
 				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);
 
-	if (attr->ofs == 1)
-		return rtl8366s_vlan_set_vlan(smi, val->value.i);
-	else
-		return rtl8366s_vlan_set_4ktable(smi, val->value.i);
+	val->value.i = ((data & (RTL8366S_SGCR_MAX_LENGTH_MASK)) >> 4);
+
+	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 rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-	u32 len = 0, data = 0;
+	u32 data;
 
-	if (val->port_vlan >= RTL8366S_NUM_PORTS)
-		return -EINVAL;
+	rtl8366_smi_read_reg(smi,RTL8366S_SSCR0, &data);
+	val->value.i = !data;
+
+	return 0;
+}
 
-	memset(smi->buf, '\0', sizeof(smi->buf));
-	rtl8366_smi_read_reg(smi, RTL8366S_PORT_LINK_STATUS_BASE +
-			     (val->port_vlan / 2), &data);
 
-	if (val->port_vlan % 2)
-		data = data >> 8;
+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 (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);
-	}
+	if (!val->value.i)
+		portmask = RTL8366S_PORT_ALL;
+
+	/* set learning for all ports */
+	REG_WR(smi, RTL8366S_SSCR0, portmask);
 
-	val->value.s = smi->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 rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-	char *buf = smi->buf;
-	int err;
+	u32 data = 0;
+	u32 speed;
 
-	if (val->port_vlan == 0 || val->port_vlan >= RTL8366S_NUM_VLANS)
+	if (port >= RTL8366S_NUM_PORTS)
 		return -EINVAL;
 
-	memset(buf, '\0', sizeof(smi->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(smi->buf) - len,
-			"VLAN %d: Ports: '", vlan4k.vid);
+	link->link = !!(data & RTL8366S_PORT_STATUS_LINK_MASK);
+	if (!link->link)
+		return 0;
 
-	for (i = 0; i < RTL8366S_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(smi->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(smi->buf) - len,
-			"', members=%04x, untag=%04x, fid=%u",
-			vlan4k.member, vlan4k.untag, vlan4k.fid);
-
-	val->value.s = buf;
-	val->len = len;
-
 	return 0;
 }
 
@@ -786,7 +800,7 @@ static int rtl8366s_sw_set_port_led(struct switch_dev *dev,
 		data = val->value.i << (val->port_vlan * 4);
 	}
 
-	return rtl8366_smi_rmwr(smi, RTL8366S_LED_BLINKRATE_REG, mask, data);
+	return rtl8366_smi_rmwr(smi, reg, mask, data);
 }
 
 static int rtl8366s_sw_get_port_led(struct switch_dev *dev,
@@ -819,89 +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 rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-	int i, len = 0;
-	unsigned long long counter = 0;
-	char *buf = smi->buf;
-
-	if (val->port_vlan >= RTL8366S_NUM_PORTS)
-		return -EINVAL;
-
-	len += snprintf(buf + len, sizeof(smi->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(smi->buf) - len,
-				"%-36s: ", rtl8366s_mib_counters[i].name);
-		if (!rtl8366_get_mib_counter(smi, i, val->port_vlan, &counter))
-			len += snprintf(buf + len, sizeof(smi->buf) - len,
-					"%llu\n", counter);
-		else
-			len += snprintf(buf + len, sizeof(smi->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 >= RTL8366S_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 < RTL8366S_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 >= RTL8366S_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 rtl8366_set_vlan(smi, val->port_vlan, member, untag, 0);
-}
-
 static int rtl8366s_sw_reset_switch(struct switch_dev *dev)
 {
 	struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
@@ -915,24 +846,39 @@ static int rtl8366s_sw_reset_switch(struct switch_dev *dev)
 	if (err)
 		return err;
 
-	return rtl8366_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
 	}, {
@@ -948,18 +894,19 @@ 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_NOVAL,
 		.name = "reset_mib",
 		.description = "Reset single port MIB counters",
@@ -970,7 +917,7 @@ static struct switch_attr rtl8366s_port[] = {
 		.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",
@@ -988,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 = RTL8366S_PORT_NUM_CPU,
-	.ports = RTL8366S_NUM_PORTS,
-	.vlans = RTL8366S_NUM_VLANS,
+static const struct switch_dev_ops rtl8366_ops = {
 	.attr_global = {
 		.attr = rtl8366s_globals,
 		.n_attr = ARRAY_SIZE(rtl8366s_globals),
@@ -1011,11 +960,12 @@ 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_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 rtl8366_smi *smi)
@@ -1023,9 +973,12 @@ static int rtl8366s_switch_init(struct rtl8366_smi *smi)
 	struct switch_dev *dev = &smi->sw_dev;
 	int err;
 
-	memcpy(dev, &rtl8366_switch_dev, sizeof(struct switch_dev));
-	dev->priv = smi;
-	dev->devname = dev_name(smi->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)
@@ -1065,12 +1018,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;
@@ -1130,12 +1077,16 @@ static struct rtl8366_smi_ops rtl8366s_smi_ops = {
 	.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 rtl8366_platform_data *pdata;
 	struct rtl8366_smi *smi;
 	int err;
 
@@ -1158,6 +1109,9 @@ static int __init rtl8366s_probe(struct platform_device *pdev)
 
 	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;
@@ -1186,32 +1140,6 @@ static int __init rtl8366s_probe(struct platform_device *pdev)
 	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 rtl8366_smi *smi = platform_get_drvdata(pdev);
@@ -1237,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);