rtl8366_smi: add linux 4.4 compatibility

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

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
index 44074633e2a9e64babe1fdaa6e88ce9d581913fb..b8cdf30de48c8b94ec54fa78819fb093830e6650 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8366_smi.c
@@ -15,9 +15,11 @@
 #include <linux/gpio.h>
 #include <linux/spinlock.h>
 #include <linux/skbuff.h>
+#include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/of_gpio.h>
 #include <linux/rtl8366.h>
+#include <linux/version.h>
 
 #ifdef CONFIG_RTL8366_SMI_DEBUG_FS
 #include <linux/debugfs.h>
@@ -742,7 +744,7 @@ static ssize_t rtl8366_write_debugfs_reg(struct file *file,
                buf[len - 1] = '\0';
 
 
-       if (strict_strtoul(buf, 16, &data)) {
+       if (kstrtoul(buf, 16, &data)) {
                dev_err(smi->parent, "Invalid reg value %s\n", buf);
        } else {
                err = rtl8366_smi_write_reg(smi, reg, data);
@@ -913,7 +915,6 @@ static inline void rtl8366_debugfs_remove(struct rtl8366_smi *smi) {}
 static int rtl8366_smi_mii_init(struct rtl8366_smi *smi)
 {
        int ret;
-       int i;
 
        smi->mii_bus = mdiobus_alloc();
        if (smi->mii_bus == NULL) {
@@ -929,9 +930,14 @@ static int rtl8366_smi_mii_init(struct rtl8366_smi *smi)
                 dev_name(smi->parent));
        smi->mii_bus->parent = smi->parent;
        smi->mii_bus->phy_mask = ~(0x1f);
-       smi->mii_bus->irq = smi->mii_irq;
-       for (i = 0; i < PHY_MAX_ADDR; i++)
-               smi->mii_irq[i] = PHY_POLL;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,5,0)
+       {
+               int i;
+               smi->mii_bus->irq = smi->mii_irq;
+               for (i = 0; i < PHY_MAX_ADDR; i++)
+                       smi->mii_irq[i] = PHY_POLL;
+       }
+#endif
 
        ret = mdiobus_register(smi->mii_bus);
        if (ret)
@@ -1108,6 +1114,7 @@ int rtl8366_sw_set_vlan_ports(struct switch_dev *dev, struct switch_val *val)
 
        port = &val->value.ports[0];
        for (i = 0; i < val->len; i++, port++) {
+               int pvid = 0;
                member |= BIT(port->id);
 
                if (!(port->flags & BIT(SWITCH_PORT_FLAG_TAGGED)))
@@ -1117,9 +1124,14 @@ int rtl8366_sw_set_vlan_ports(struct switch_dev *dev, struct switch_val *val)
                 * To ensure that we have a valid MC entry for this VLAN,
                 * initialize the port VLAN ID here.
                 */
-               err = rtl8366_set_pvid(smi, port->id, val->port_vlan);
+               err = rtl8366_get_pvid(smi, port->id, &pvid);
                if (err < 0)
                        return err;
+               if (pvid == 0) {
+                       err = rtl8366_set_pvid(smi, port->id, val->port_vlan);
+                       if (err < 0)
+                               return err;
+               }
        }
 
        return rtl8366_set_vlan(smi, val->port_vlan, member, untag, 0);
@@ -1378,7 +1390,7 @@ int rtl8366_smi_probe_of(struct platform_device *pdev, struct rtl8366_smi *smi)
        int sck = of_get_named_gpio(pdev->dev.of_node, "gpio-sck", 0);
        int sda = of_get_named_gpio(pdev->dev.of_node, "gpio-sda", 0);
 
-       if (!sck || !sda) {
+       if (!gpio_is_valid(sck) || !gpio_is_valid(sda)) {
                dev_err(&pdev->dev, "gpios missing in devictree\n");
                return -EINVAL;
        }
@@ -1389,7 +1401,7 @@ int rtl8366_smi_probe_of(struct platform_device *pdev, struct rtl8366_smi *smi)
        return 0;
 }
 #else
-static inline int rtl8366_smi_probe_of(struct device_node *np, struct rtl8366_smi *smi)
+static inline int rtl8366_smi_probe_of(struct platform_device *pdev, struct rtl8366_smi *smi)
 {
        return -ENODEV;
 }