remove CONFIG_MTD_PARTITIONS references from lantiq 3.0 patches

[openwrt.git] / target / linux / generic / files / drivers / net / phy / rtl8366rb.c

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
index 492ed25..640ed51 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366rb.c
@@ -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
@@ -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);
 
@@ -962,7 +958,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[] = {
@@ -1152,12 +1156,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;
@@ -1277,36 +1275,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 +1300,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);