X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/14f9ab7993b9e07f16cc3e10dd4f8da3a32d79f2..c097ab2bbd8d45e3cc0075cf27dca6f76cb5efe5:/target/linux/generic/files/drivers/net/phy/rtl8366rb.c?ds=sidebyside diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c index 492ed2535..020e93a44 100644 --- a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c +++ b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include "rtl8366_smi.h" @@ -26,7 +26,6 @@ #define RTL8366RB_PHY_NO_MAX 4 #define RTL8366RB_PHY_PAGE_MAX 7 #define RTL8366RB_PHY_ADDR_MAX 31 -#define RTL8366RB_PHY_WAN 4 /* Switch Global Configuration register */ #define RTL8366RB_SGCR 0x0000 @@ -247,8 +246,8 @@ static int rtl8366rb_reset_chip(struct rtl8366_smi *smi) int timeout = 10; u32 data; - rtl8366_smi_write_reg(smi, RTL8366RB_RESET_CTRL_REG, - RTL8366RB_CHIP_CTRL_RESET_HW); + rtl8366_smi_write_reg_noack(smi, RTL8366RB_RESET_CTRL_REG, + RTL8366RB_CHIP_CTRL_RESET_HW); do { msleep(1); if (rtl8366_smi_read_reg(smi, RTL8366RB_RESET_CTRL_REG, &data)) @@ -274,9 +273,6 @@ static int rtl8366rb_hw_init(struct rtl8366_smi *smi) REG_RMW(smi, RTL8366RB_SGCR, RTL8366RB_SGCR_MAX_LENGTH_MASK, RTL8366RB_SGCR_MAX_LENGTH_1536); - /* enable all ports */ - REG_WR(smi, RTL8366RB_PECR, 0); - /* enable learning for all ports */ REG_WR(smi, RTL8366RB_SSCR0, 0); @@ -685,59 +681,47 @@ static int rtl8366rb_sw_set_learning_enable(struct switch_dev *dev, return 0; } - -static const char *rtl8366rb_speed_str(unsigned speed) -{ - switch (speed) { - case 0: - return "10baseT"; - case 1: - return "100baseT"; - case 2: - return "1000baseT"; - } - - return "unknown"; -} - static int rtl8366rb_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 >= RTL8366RB_NUM_PORTS) + if (port >= RTL8366RB_NUM_PORTS) return -EINVAL; - memset(smi->buf, '\0', sizeof(smi->buf)); - rtl8366_smi_read_reg(smi, RTL8366RB_PORT_LINK_STATUS_BASE + - (val->port_vlan / 2), &data); + rtl8366_smi_read_reg(smi, RTL8366RB_PORT_LINK_STATUS_BASE + (port / 2), + &data); - if (val->port_vlan % 2) + if (port % 2) data = data >> 8; - if (data & RTL8366RB_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, - rtl8366rb_speed_str(data & - RTL8366RB_PORT_STATUS_SPEED_MASK), - (data & RTL8366RB_PORT_STATUS_DUPLEX_MASK) ? - "full" : "half", - (data & RTL8366RB_PORT_STATUS_TXPAUSE_MASK) ? - "tx-pause ": "", - (data & RTL8366RB_PORT_STATUS_RXPAUSE_MASK) ? - "rx-pause " : "", - (data & RTL8366RB_PORT_STATUS_AN_MASK) ? - "nway ": ""); - } else { - len = snprintf(smi->buf, sizeof(smi->buf), "port:%d link: down", - val->port_vlan); - } + link->link = !!(data & RTL8366RB_PORT_STATUS_LINK_MASK); + if (!link->link) + return 0; - val->value.s = smi->buf; - val->len = len; + link->duplex = !!(data & RTL8366RB_PORT_STATUS_DUPLEX_MASK); + link->rx_flow = !!(data & RTL8366RB_PORT_STATUS_RXPAUSE_MASK); + link->tx_flow = !!(data & RTL8366RB_PORT_STATUS_TXPAUSE_MASK); + link->aneg = !!(data & RTL8366RB_PORT_STATUS_AN_MASK); + + speed = (data & RTL8366RB_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; } @@ -962,7 +946,15 @@ static int rtl8366rb_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 rtl8366rb_globals[] = { @@ -1014,13 +1006,6 @@ static struct switch_attr rtl8366rb_globals[] = { static struct switch_attr rtl8366rb_port[] = { { - .type = SWITCH_TYPE_STRING, - .name = "link", - .description = "Get port link information", - .max = 1, - .set = NULL, - .get = rtl8366rb_sw_get_port_link, - }, { .type = SWITCH_TYPE_NOVAL, .name = "reset_mib", .description = "Reset single port MIB counters", @@ -1100,6 +1085,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 = rtl8366rb_sw_reset_switch, + .get_port_link = rtl8366rb_sw_get_port_link, }; static int rtl8366rb_switch_init(struct rtl8366_smi *smi) @@ -1112,7 +1098,7 @@ static int rtl8366rb_switch_init(struct rtl8366_smi *smi) dev->ports = RTL8366RB_NUM_PORTS; dev->vlans = RTL8366RB_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) @@ -1152,12 +1138,6 @@ static int rtl8366rb_mii_write(struct mii_bus *bus, int addr, int reg, u16 val) return err; } -static int rtl8366rb_mii_bus_match(struct mii_bus *bus) -{ - return (bus->read == rtl8366rb_mii_read && - bus->write == rtl8366rb_mii_write); -} - static int rtl8366rb_setup(struct rtl8366_smi *smi) { int ret; @@ -1226,7 +1206,7 @@ static struct rtl8366_smi_ops rtl8366rb_smi_ops = { static int __devinit rtl8366rb_probe(struct platform_device *pdev) { static int rtl8366_smi_version_printed; - struct rtl8366rb_platform_data *pdata; + struct rtl8366_platform_data *pdata; struct rtl8366_smi *smi; int err; @@ -1249,6 +1229,9 @@ static int __devinit rtl8366rb_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 = &rtl8366rb_smi_ops; smi->cpu_port = RTL8366RB_PORT_NUM_CPU; smi->num_ports = RTL8366RB_NUM_PORTS; @@ -1277,36 +1260,6 @@ static int __devinit rtl8366rb_probe(struct platform_device *pdev) return err; } -static int rtl8366rb_phy_config_init(struct phy_device *phydev) -{ - if (!rtl8366rb_mii_bus_match(phydev->bus)) - return -EINVAL; - - return 0; -} - -static int rtl8366rb_phy_config_aneg(struct phy_device *phydev) -{ - /* phy 4 might be connected to a second mac, allow aneg config */ - if (phydev->addr == RTL8366RB_PHY_WAN) - return genphy_config_aneg(phydev); - - return 0; -} - -static struct phy_driver rtl8366rb_phy_driver = { - .phy_id = 0x001cc960, - .name = "Realtek RTL8366RB", - .phy_id_mask = 0x1ffffff0, - .features = PHY_GBIT_FEATURES, - .config_aneg = rtl8366rb_phy_config_aneg, - .config_init = rtl8366rb_phy_config_init, - .read_status = genphy_read_status, - .driver = { - .owner = THIS_MODULE, - }, -}; - static int __devexit rtl8366rb_remove(struct platform_device *pdev) { struct rtl8366_smi *smi = platform_get_drvdata(pdev); @@ -1332,26 +1285,12 @@ static struct platform_driver rtl8366rb_driver = { static int __init rtl8366rb_module_init(void) { - int ret; - ret = platform_driver_register(&rtl8366rb_driver); - if (ret) - return ret; - - ret = phy_driver_register(&rtl8366rb_phy_driver); - if (ret) - goto err_platform_unregister; - - return 0; - - err_platform_unregister: - platform_driver_unregister(&rtl8366rb_driver); - return ret; + return platform_driver_register(&rtl8366rb_driver); } module_init(rtl8366rb_module_init); static void __exit rtl8366rb_module_exit(void) { - phy_driver_unregister(&rtl8366rb_phy_driver); platform_driver_unregister(&rtl8366rb_driver); } module_exit(rtl8366rb_module_exit);