#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
-#include <linux/platform_device.h>
+#include <linux/device.h>
+#include <linux/of.h>
+#include <linux/of_platform.h>
#include <linux/delay.h>
#include <linux/skbuff.h>
#include <linux/rtl8366.h>
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;
pdata = smi->parent->platform_data;
- if (pdata->num_initvals && pdata->initvals) {
+ if (pdata && pdata->num_initvals && pdata->initvals) {
unsigned i;
dev_info(smi->parent, "applying initvals\n");
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,
.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,
};
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;
static struct rtl8366_smi_ops rtl8366s_smi_ops = {
.detect = rtl8366s_detect,
+ .reset_chip = rtl8366s_reset_chip,
.setup = rtl8366s_setup,
.mii_read = rtl8366s_mii_read,
.enable_port = rtl8366s_enable_port,
};
-static int __devinit rtl8366s_probe(struct platform_device *pdev)
+static int rtl8366s_probe(struct platform_device *pdev)
{
static int rtl8366_smi_version_printed;
- struct rtl8366_platform_data *pdata;
struct rtl8366_smi *smi;
int err;
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;
rtl8366_smi_cleanup(smi);
err_free_smi:
kfree(smi);
- err_out:
return err;
}
-static int __devexit rtl8366s_remove(struct platform_device *pdev)
+static int rtl8366s_remove(struct platform_device *pdev)
{
struct rtl8366_smi *smi = platform_get_drvdata(pdev);
return 0;
}
+#ifdef CONFIG_OF
+static const struct of_device_id rtl8366s_match[] = {
+ { .compatible = "realtek,rtl8366s" },
+ {},
+};
+MODULE_DEVICE_TABLE(of, rtl8366s_match);
+#endif
+
static struct platform_driver rtl8366s_driver = {
.driver = {
.name = RTL8366S_DRIVER_NAME,
.owner = THIS_MODULE,
+#ifdef CONFIG_OF
+ .of_match_table = of_match_ptr(rtl8366s_match),
+#endif
},
.probe = rtl8366s_probe,
- .remove = __devexit_p(rtl8366s_remove),
+ .remove = rtl8366s_remove,
};
static int __init rtl8366s_module_init(void)