generic: rtl8366{s,rb}: remove the PHY driver.

[openwrt/svn-archive/archive.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 74e0a3029cd3ef2b3facbd9654f690ce1f506289..3f3d6f6ac316d9e4917f892a146adf8145c9b772 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/rtl8366s.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366s.c
@@ -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_WAN       4
 
 /* Switch Global Configuration register */
 #define RTL8366S_SGCR                          0x0000
@@ -251,8 +250,19 @@ static int rtl8366s_reset_chip(struct rtl8366_smi *smi)
 
 static int rtl8366s_hw_init(struct rtl8366_smi *smi)
 {
+       struct rtl8366s_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);
@@ -809,6 +819,10 @@ static int rtl8366s_sw_reset_switch(struct switch_dev *dev)
        if (err)
                return err;
 
+       err = rtl8366_enable_vlan(smi, 1);
+       if (err)
+               return err;
+
        return rtl8366_enable_all_ports(smi, 1);
 }
 
@@ -971,12 +985,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;
@@ -1096,36 +1104,6 @@ static int __devinit 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)
-{
-       /* 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);
@@ -1151,26 +1129,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);