remove CONFIG_MTD_PARTITIONS references from lantiq 3.0 patches

[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 80a546a..3f3d6f6 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,15 +250,23 @@ 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);
 
-       /* enable all ports */
-       REG_WR(smi, RTL8366S_PECR, 0);
-
        /* enable learning for all ports */
        REG_WR(smi, RTL8366S_SSCR0, 0);
 
@@ -605,6 +612,12 @@ static int rtl8366s_is_vlan_valid(struct rtl8366_smi *smi, unsigned vlan)
        return 1;
 }
 
+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));
+}
+
 static int rtl8366s_sw_reset_mibs(struct switch_dev *dev,
                                  const struct switch_attr *attr,
                                  struct switch_val *val)
@@ -802,7 +815,15 @@ static int rtl8366s_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 rtl8366s_globals[] = {
@@ -964,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;
@@ -1032,6 +1047,7 @@ static struct rtl8366_smi_ops rtl8366s_smi_ops = {
        .is_vlan_valid  = rtl8366s_is_vlan_valid,
        .enable_vlan    = rtl8366s_enable_vlan,
        .enable_vlan4k  = rtl8366s_enable_vlan4k,
+       .enable_port    = rtl8366s_enable_port,
 };
 
 static int __devinit rtl8366s_probe(struct platform_device *pdev)
@@ -1088,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);
@@ -1143,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);