make rtl8366 driver OF capable

[openwrt/staging/chunkeey.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 7f9680aa11323bdb09d8cc3a13f9564e6e71095a..6e5e48749ba3ed76ae0e40940a9df4812c74b457 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/rtl8366s.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366s.c
@@ -12,7 +12,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/platform_device.h>
+#include <linux/of_platform.h>
 #include <linux/delay.h>
 #include <linux/skbuff.h>
 #include <linux/rtl8366.h>
@@ -248,7 +248,7 @@ static int rtl8366s_reset_chip(struct rtl8366_smi *smi)
        return 0;
 }
 
-static int rtl8366s_hw_init(struct rtl8366_smi *smi)
+static int rtl8366s_setup(struct rtl8366_smi *smi)
 {
        struct rtl8366_platform_data *pdata;
        int err;
@@ -833,30 +833,6 @@ static int rtl8366s_sw_reset_port_mibs(struct switch_dev *dev,
                                0, (1 << (val->port_vlan + 3)));
 }
 
-static int rtl8366s_sw_reset_switch(struct switch_dev *dev)
-{
-       struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
-       int err;
-
-       err = rtl8366s_reset_chip(smi);
-       if (err)
-               return err;
-
-       err = rtl8366s_hw_init(smi);
-       if (err)
-               return err;
-
-       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[] = {
        {
                .type = SWITCH_TYPE_INT,
@@ -964,7 +940,7 @@ static const struct switch_dev_ops rtl8366_ops = {
        .set_vlan_ports = rtl8366_sw_set_vlan_ports,
        .get_port_pvid = rtl8366_sw_get_port_pvid,
        .set_port_pvid = rtl8366_sw_set_port_pvid,
-       .reset_switch = rtl8366s_sw_reset_switch,
+       .reset_switch = rtl8366_sw_reset_switch,
        .get_port_link = rtl8366s_sw_get_port_link,
 };
 
@@ -1018,18 +994,6 @@ static int rtl8366s_mii_write(struct mii_bus *bus, int addr, int reg, u16 val)
        return err;
 }
 
-static int rtl8366s_setup(struct rtl8366_smi *smi)
-{
-       int ret;
-
-       ret = rtl8366s_reset_chip(smi);
-       if (ret)
-               return ret;
-
-       ret = rtl8366s_hw_init(smi);
-       return ret;
-}
-
 static int rtl8366s_detect(struct rtl8366_smi *smi)
 {
        u32 chip_id = 0;
@@ -1065,6 +1029,7 @@ static int rtl8366s_detect(struct rtl8366_smi *smi)
 
 static struct rtl8366_smi_ops rtl8366s_smi_ops = {
        .detect         = rtl8366s_detect,
+       .reset_chip     = rtl8366s_reset_chip,
        .setup          = rtl8366s_setup,
 
        .mii_read       = rtl8366s_mii_read,
@@ -1094,21 +1059,10 @@ static int __devinit rtl8366s_probe(struct platform_device *pdev)
                printk(KERN_NOTICE RTL8366S_DRIVER_DESC
                       " version " RTL8366S_DRIVER_VER"\n");
 
-       pdata = pdev->dev.platform_data;
-       if (!pdata) {
-               dev_err(&pdev->dev, "no platform data specified\n");
-               err = -EINVAL;
-               goto err_out;
-       }
-
-       smi = rtl8366_smi_alloc(&pdev->dev);
-       if (!smi) {
-               err = -ENOMEM;
-               goto err_out;
-       }
+       smi = rtl8366_smi_probe(pdev);
+       if (!smi)
+               return -ENODEV;
 
-       smi->gpio_sda = pdata->gpio_sda;
-       smi->gpio_sck = pdata->gpio_sck;
        smi->clk_delay = 10;
        smi->cmd_read = 0xa9;
        smi->cmd_write = 0xa8;
@@ -1154,10 +1108,19 @@ static int __devexit rtl8366s_remove(struct platform_device *pdev)
        return 0;
 }
 
+#ifdef CONFIG_OF
+static const struct of_device_id rtl8366s_match[] = {
+       { .compatible = "rtl8366s" },
+       {},
+};
+MODULE_DEVICE_TABLE(of, rtl8366s_match);
+#endif
+
 static struct platform_driver rtl8366s_driver = {
        .driver = {
                .name           = RTL8366S_DRIVER_NAME,
                .owner          = THIS_MODULE,
+               .of_match_table = of_match_ptr(rtl8366s_match),
        },
        .probe          = rtl8366s_probe,
        .remove         = __devexit_p(rtl8366s_remove),