projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
generic: ar8216: simplify ar8216_config_init
[openwrt.git] / 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 3b7fcce..7f9680a 100644 (file)
--- 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/platform_device.h>
 #include <linux/delay.h>
 #include <linux/skbuff.h>
-#include <linux/rtl8366s.h>
+#include <linux/rtl8366.h>
 
 #include "rtl8366_smi.h"
 
 
 #include "rtl8366_smi.h"
 
@@ -25,7 +25,6 @@
 #define RTL8366S_PHY_NO_MAX    4
 #define RTL8366S_PHY_PAGE_MAX  7
 #define RTL8366S_PHY_ADDR_MAX  31
 #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
 
 /* Switch Global Configuration register */
 #define RTL8366S_SGCR                          0x0000
@@ -230,8 +229,8 @@ static int rtl8366s_reset_chip(struct rtl8366_smi *smi)
        int timeout = 10;
        u32 data;
 
        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))
        do {
                msleep(1);
                if (rtl8366_smi_read_reg(smi, RTL8366S_RESET_CTRL_REG, &data))
@@ -251,8 +250,19 @@ 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 rtl8366_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);
@@ -645,6 +655,49 @@ static int rtl8366s_sw_set_blinkrate(struct switch_dev *dev,
                                val->value.i);
 }
 
                                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)
 static int rtl8366s_sw_get_learning_enable(struct switch_dev *dev,
                                           const struct switch_attr *attr,
                                           struct switch_val *val)
@@ -679,59 +732,47 @@ static int rtl8366s_sw_set_learning_enable(struct switch_dev *dev,
        return 0;
 }
 
        return 0;
 }
 
-
-static const char *rtl8366s_speed_str(unsigned speed)
-{
-       switch (speed) {
-       case 0:
-               return "10baseT";
-       case 1:
-               return "100baseT";
-       case 2:
-               return "1000baseT";
-       }
-
-       return "unknown";
-}
-
 static int rtl8366s_sw_get_port_link(struct switch_dev *dev,
 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);
 {
        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;
 
                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;
 
                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;
 }
 
        return 0;
 }
@@ -853,18 +894,19 @@ static struct switch_attr rtl8366s_globals[] = {
                .set = rtl8366s_sw_set_blinkrate,
                .get = rtl8366s_sw_get_blinkrate,
                .max = 5
                .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[] = {
        {
        },
 };
 
 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",
                .type = SWITCH_TYPE_NOVAL,
                .name = "reset_mib",
                .description = "Reset single port MIB counters",
@@ -923,6 +965,7 @@ static const struct switch_dev_ops rtl8366_ops = {
        .get_port_pvid = rtl8366_sw_get_port_pvid,
        .set_port_pvid = rtl8366_sw_set_port_pvid,
        .reset_switch = rtl8366s_sw_reset_switch,
        .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)
 };
 
 static int rtl8366s_switch_init(struct rtl8366_smi *smi)
@@ -935,7 +978,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->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)
 
        err = register_switch(dev, NULL);
        if (err)
@@ -975,12 +1018,6 @@ 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 rtl8366_smi *smi)
 {
        int ret;
 static int rtl8366s_setup(struct rtl8366_smi *smi)
 {
        int ret;
@@ -1049,7 +1086,7 @@ static struct rtl8366_smi_ops rtl8366s_smi_ops = {
 static int __devinit rtl8366s_probe(struct platform_device *pdev)
 {
        static int rtl8366_smi_version_printed;
 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;
 
        struct rtl8366_smi *smi;
        int err;
 
@@ -1072,6 +1109,9 @@ static int __devinit rtl8366s_probe(struct platform_device *pdev)
 
        smi->gpio_sda = pdata->gpio_sda;
        smi->gpio_sck = pdata->gpio_sck;
 
        smi->gpio_sda = pdata->gpio_sda;
        smi->gpio_sck = pdata->gpio_sck;
+       smi->clk_delay = 10;
+       smi->cmd_read = 0xa9;
+       smi->cmd_write = 0xa8;
        smi->ops = &rtl8366s_smi_ops;
        smi->cpu_port = RTL8366S_PORT_NUM_CPU;
        smi->num_ports = RTL8366S_NUM_PORTS;
        smi->ops = &rtl8366s_smi_ops;
        smi->cpu_port = RTL8366S_PORT_NUM_CPU;
        smi->num_ports = RTL8366S_NUM_PORTS;
@@ -1100,36 +1140,6 @@ static int __devinit rtl8366s_probe(struct platform_device *pdev)
        return err;
 }
 
        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)
 {
        struct rtl8366_smi *smi = platform_get_drvdata(pdev);
 static int __devexit rtl8366s_remove(struct platform_device *pdev)
 {
        struct rtl8366_smi *smi = platform_get_drvdata(pdev);
@@ -1155,26 +1165,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);
Personal OpenWRT clone
This page took 0.036451 seconds and 4 git commands to generate.