remove CONFIG_MTD_PARTITIONS references from lantiq 3.0 patches
[openwrt.git] / target / linux / generic / files / drivers / net / phy / rtl8366s.c
index 0d1291a..3f3d6f6 100644 (file)
 #define RTL8366S_VLAN_FID_SHIFT                12
 #define RTL8366S_VLAN_FID_MASK         0x7
 
 #define RTL8366S_VLAN_FID_SHIFT                12
 #define RTL8366S_VLAN_FID_MASK         0x7
 
-struct rtl8366s {
-       struct device           *parent;
-       struct rtl8366_smi      smi;
-};
-
 static struct rtl8366_mib_counter rtl8366s_mib_counters[] = {
        { 0,  0, 4, "IfInOctets"                                },
        { 0,  4, 4, "EtherStatsOctets"                          },
 static struct rtl8366_mib_counter rtl8366s_mib_counters[] = {
        { 0,  0, 4, "IfInOctets"                                },
        { 0,  4, 4, "EtherStatsOctets"                          },
@@ -229,17 +224,6 @@ static struct rtl8366_mib_counter rtl8366s_mib_counters[] = {
                        return err;                                     \
        } while (0)
 
                        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)
-{
-       struct rtl8366_smi *smi = sw_to_rtl8366_smi(sw);
-       return smi_to_rtl8366s(smi);
-}
-
 static int rtl8366s_reset_chip(struct rtl8366_smi *smi)
 {
        int timeout = 10;
 static int rtl8366s_reset_chip(struct rtl8366_smi *smi)
 {
        int timeout = 10;
@@ -266,20 +250,28 @@ static int rtl8366s_reset_chip(struct rtl8366_smi *smi)
 
 static int rtl8366s_hw_init(struct rtl8366_smi *smi)
 {
 
 static int rtl8366s_hw_init(struct rtl8366_smi *smi)
 {
+       struct rtl8366s_platform_data *pdata;
        int err;
 
        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);
 
        /* 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);
-
-       /* disable learning for all ports */
-       REG_WR(smi, RTL8366S_SSCR0, RTL8366S_PORT_ALL);
+       /* enable learning for all ports */
+       REG_WR(smi, RTL8366S_SSCR0, 0);
 
 
-       /* 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
 
        /*
         * discard VLAN tagged packets if the port is not a member of
@@ -470,8 +462,8 @@ static int rtl8366s_set_vlan_4k(struct rtl8366_smi *smi,
        int i;
 
        if (vlan4k->vid >= RTL8366S_NUM_VIDS ||
        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;
 
            vlan4k->fid > RTL8366S_FIDMAX)
                return -EINVAL;
 
@@ -539,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 ||
        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;
 
            vlanmc->fid > RTL8366S_FIDMAX)
                return -EINVAL;
 
@@ -595,51 +587,44 @@ static int rtl8366s_set_mc_index(struct rtl8366_smi *smi, int port, int index)
                                        RTL8366S_PORT_VLAN_CTRL_SHIFT(port));
 }
 
                                        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);
 }
 
 {
        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);
 }
 
 {
        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,
 }
 
 static int rtl8366s_sw_get_blinkrate(struct switch_dev *dev,
@@ -670,18 +655,41 @@ static int rtl8366s_sw_set_blinkrate(struct switch_dev *dev,
                                val->value.i);
 }
 
                                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_learning_enable(struct switch_dev *dev,
+                                          const struct switch_attr *attr,
+                                          struct switch_val *val)
 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
+       u32 data;
+
+       rtl8366_smi_read_reg(smi,RTL8366S_SSCR0, &data);
+       val->value.i = !data;
 
 
-       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 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);
+
+       /* set auto ageing for all ports */
+       REG_WR(smi, RTL8366S_SSCR1, portmask);
+
+       return 0;
+}
+
+
 static const char *rtl8366s_speed_str(unsigned speed)
 {
        switch (speed) {
 static const char *rtl8366s_speed_str(unsigned speed)
 {
        switch (speed) {
@@ -738,47 +746,6 @@ static int rtl8366s_sw_get_port_link(struct switch_dev *dev,
        return 0;
 }
 
        return 0;
 }
 
-static int rtl8366s_sw_get_vlan_info(struct switch_dev *dev,
-                                    const struct switch_attr *attr,
-                                    struct switch_val *val)
-{
-       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;
-
-       if (val->port_vlan == 0 || val->port_vlan >= RTL8366S_NUM_VLANS)
-               return -EINVAL;
-
-       memset(buf, '\0', sizeof(smi->buf));
-
-       err = rtl8366s_get_vlan_4k(smi, val->port_vlan, &vlan4k);
-       if (err)
-               return err;
-
-       len += snprintf(buf + len, sizeof(smi->buf) - len,
-                       "VLAN %d: Ports: '", vlan4k.vid);
-
-       for (i = 0; i < RTL8366S_NUM_PORTS; i++) {
-               if (!(vlan4k.member & (1 << i)))
-                       continue;
-
-               len += snprintf(buf + len, sizeof(smi->buf) - len, "%d%s", i,
-                               (vlan4k.untag & (1 << i)) ? "" : "t");
-       }
-
-       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;
-}
-
 static int rtl8366s_sw_set_port_led(struct switch_dev *dev,
                                    const struct switch_attr *attr,
                                    struct switch_val *val)
 static int rtl8366s_sw_set_port_led(struct switch_dev *dev,
                                    const struct switch_attr *attr,
                                    struct switch_val *val)
@@ -802,7 +769,7 @@ static int rtl8366s_sw_set_port_led(struct switch_dev *dev,
                data = val->value.i << (val->port_vlan * 4);
        }
 
                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,
 }
 
 static int rtl8366s_sw_get_port_led(struct switch_dev *dev,
@@ -835,101 +802,6 @@ static int rtl8366s_sw_reset_port_mibs(struct switch_dev *dev,
                                0, (1 << (val->port_vlan + 3)));
 }
 
                                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_get_port_pvid(struct switch_dev *dev, int port, int *val)
-{
-       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-       return rtl8366_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 rtl8366_set_pvid(smi, port, val);
-}
-
 static int rtl8366s_sw_reset_switch(struct switch_dev *dev)
 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
 static int rtl8366s_sw_reset_switch(struct switch_dev *dev)
 {
        struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
@@ -943,24 +815,39 @@ static int rtl8366s_sw_reset_switch(struct switch_dev *dev)
        if (err)
                return err;
 
        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[] = {
        {
 }
 
 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",
                .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",
                .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
        }, {
                .max = 1,
                .ofs = 2
        }, {
@@ -998,7 +885,7 @@ static struct switch_attr rtl8366s_port[] = {
                .description = "Get MIB counters for port",
                .max = 33,
                .set = NULL,
                .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",
        }, {
                .type = SWITCH_TYPE_INT,
                .name = "led",
@@ -1016,16 +903,18 @@ static struct switch_attr rtl8366s_vlan[] = {
                .description = "Get vlan information",
                .max = 1,
                .set = NULL,
                .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),
        .attr_global = {
                .attr = rtl8366s_globals,
                .n_attr = ARRAY_SIZE(rtl8366s_globals),
@@ -1039,32 +928,35 @@ static struct switch_dev rtl8366_switch_dev = {
                .n_attr = ARRAY_SIZE(rtl8366s_vlan),
        },
 
                .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,
 };
 
        .reset_switch = rtl8366s_sw_reset_switch,
 };
 
-static int rtl8366s_switch_init(struct rtl8366s *rtl)
+static int rtl8366s_switch_init(struct rtl8366_smi *smi)
 {
 {
-       struct switch_dev *dev = &rtl->smi.sw_dev;
+       struct switch_dev *dev = &smi->sw_dev;
        int err;
 
        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->devname = dev_name(smi->parent);
 
        err = register_switch(dev, NULL);
        if (err)
 
        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;
 }
 
 
        return err;
 }
 
-static void rtl8366s_switch_cleanup(struct rtl8366s *rtl)
+static void rtl8366s_switch_cleanup(struct rtl8366_smi *smi)
 {
 {
-       unregister_switch(&rtl->smi.sw_dev);
+       unregister_switch(&smi->sw_dev);
 }
 
 static int rtl8366s_mii_read(struct mii_bus *bus, int addr, int reg)
 }
 
 static int rtl8366s_mii_read(struct mii_bus *bus, int addr, int reg)
@@ -1093,15 +985,8 @@ static int rtl8366s_mii_write(struct mii_bus *bus, int addr, int reg, u16 val)
        return err;
 }
 
        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;
 
        ret = rtl8366s_reset_chip(smi);
        int ret;
 
        ret = rtl8366s_reset_chip(smi);
@@ -1147,6 +1032,8 @@ static int rtl8366s_detect(struct rtl8366_smi *smi)
 
 static struct rtl8366_smi_ops rtl8366s_smi_ops = {
        .detect         = rtl8366s_detect,
 
 static struct rtl8366_smi_ops rtl8366s_smi_ops = {
        .detect         = rtl8366s_detect,
+       .setup          = rtl8366s_setup,
+
        .mii_read       = rtl8366s_mii_read,
        .mii_write      = rtl8366s_mii_write,
 
        .mii_read       = rtl8366s_mii_read,
        .mii_write      = rtl8366s_mii_write,
 
@@ -1157,13 +1044,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,
        .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;
 {
        static int rtl8366_smi_version_printed;
        struct rtl8366s_platform_data *pdata;
-       struct rtl8366s *rtl;
        struct rtl8366_smi *smi;
        int err;
 
        struct rtl8366_smi *smi;
        int err;
 
@@ -1178,17 +1068,12 @@ static int __init rtl8366s_probe(struct platform_device *pdev)
                goto err_out;
        }
 
                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;
        }
 
                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->ops = &rtl8366s_smi_ops;
        smi->gpio_sda = pdata->gpio_sda;
        smi->gpio_sck = pdata->gpio_sck;
        smi->ops = &rtl8366s_smi_ops;
@@ -1200,15 +1085,11 @@ static int __init rtl8366s_probe(struct platform_device *pdev)
 
        err = rtl8366_smi_init(smi);
        if (err)
 
        err = rtl8366_smi_init(smi);
        if (err)
-               goto err_free_rtl;
-
-       platform_set_drvdata(pdev, rtl);
+               goto err_free_smi;
 
 
-       err = rtl8366s_setup(rtl);
-       if (err)
-               goto err_clear_drvdata;
+       platform_set_drvdata(pdev, smi);
 
 
-       err = rtl8366s_switch_init(rtl);
+       err = rtl8366s_switch_init(smi);
        if (err)
                goto err_clear_drvdata;
 
        if (err)
                goto err_clear_drvdata;
 
@@ -1217,47 +1098,21 @@ static int __init rtl8366s_probe(struct platform_device *pdev)
  err_clear_drvdata:
        platform_set_drvdata(pdev, NULL);
        rtl8366_smi_cleanup(smi);
  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;
 }
 
  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)
 {
 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);
+       if (smi) {
+               rtl8366s_switch_cleanup(smi);
                platform_set_drvdata(pdev, NULL);
                platform_set_drvdata(pdev, NULL);
-               rtl8366_smi_cleanup(&rtl->smi);
-               kfree(rtl);
+               rtl8366_smi_cleanup(smi);
+               kfree(smi);
        }
 
        return 0;
        }
 
        return 0;
@@ -1274,26 +1129,12 @@ static struct platform_driver rtl8366s_driver = {
 
 static int __init rtl8366s_module_init(void)
 {
 
 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)
 {
 }
 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);
        platform_driver_unregister(&rtl8366s_driver);
 }
 module_exit(rtl8366s_module_exit);
This page took 0.040801 seconds and 4 git commands to generate.