ar8216: Factor out chip-specific parameters from ar8xxx_probe_switch
[openwrt.git] / target / linux / generic / files / drivers / net / phy / ar8216.c
index 1d58f3a..fbc5bf2 100644 (file)
@@ -36,6 +36,7 @@
 #include <linux/of_device.h>
 #include <linux/leds.h>
 #include <linux/gpio.h>
+#include <linux/version.h>
 
 #include "ar8216.h"
 
@@ -69,10 +70,21 @@ struct ar8xxx_mib_desc {
 
 struct ar8xxx_chip {
        unsigned long caps;
+       bool config_at_probe;
+       bool mii_lo_first;
+
+       /* parameters to calculate REG_PORT_STATS_BASE */
+       unsigned reg_port_stats_start;
+       unsigned reg_port_stats_length;
 
        int (*hw_init)(struct ar8xxx_priv *priv);
        void (*cleanup)(struct ar8xxx_priv *priv);
 
+       const char *name;
+       int vlans;
+       int ports;
+       const struct switch_dev_ops *swops;
+
        void (*init_globals)(struct ar8xxx_priv *priv);
        void (*init_port)(struct ar8xxx_priv *priv, int port);
        void (*setup_port)(struct ar8xxx_priv *priv, int port, u32 members);
@@ -81,9 +93,11 @@ struct ar8xxx_chip {
        void (*vtu_flush)(struct ar8xxx_priv *priv);
        void (*vtu_load_vlan)(struct ar8xxx_priv *priv, u32 vid, u32 port_mask);
        void (*phy_fixup)(struct ar8xxx_priv *priv, int phy);
+       void (*set_mirror_regs)(struct ar8xxx_priv *priv);
 
        const struct ar8xxx_mib_desc *mib_decs;
        unsigned num_mibs;
+       unsigned mib_func;
 };
 
 enum ar8327_led_pattern {
@@ -139,15 +153,12 @@ struct ar8xxx_priv {
        u8 chip_ver;
        u8 chip_rev;
        const struct ar8xxx_chip *chip;
-       union {
-               struct ar8327_data ar8327;
-       } chip_data;
+       void *chip_data;
        bool initialized;
        bool port4_phy;
        char buf[2048];
 
        bool init;
-       bool mii_lo_first;
 
        struct mutex mib_lock;
        struct delayed_work mib_work;
@@ -342,6 +353,29 @@ ar8xxx_phy_poll_reset(struct mii_bus *bus)
         return -ETIMEDOUT;
 }
 
+static int
+ar8xxx_phy_check_aneg(struct phy_device *phydev)
+{
+       int ret;
+
+       if (phydev->autoneg != AUTONEG_ENABLE)
+               return 0;
+       /*
+        * BMCR_ANENABLE might have been cleared
+        * by phy_init_hw in certain kernel versions
+        * therefore check for it
+        */
+       ret = phy_read(phydev, MII_BMCR);
+       if (ret < 0)
+               return ret;
+       if (ret & BMCR_ANENABLE)
+               return 0;
+
+       dev_info(&phydev->dev, "ANEG disabled, re-enabling ...\n");
+       ret |= BMCR_ANENABLE | BMCR_ANRESTART;
+       return phy_write(phydev, MII_BMCR, ret);
+}
+
 static void
 ar8xxx_phy_init(struct ar8xxx_priv *priv)
 {
@@ -400,7 +434,7 @@ ar8xxx_mii_write(struct ar8xxx_priv *priv, int reg, u32 val)
 
        bus->write(bus, 0x18, 0, r3);
        usleep_range(1000, 2000); /* wait for the page switch to propagate */
-       if (priv->mii_lo_first) {
+       if (priv->chip->mii_lo_first) {
                bus->write(bus, 0x10 | r2, r1, lo);
                bus->write(bus, 0x10 | r2, r1 + 1, hi);
        } else {
@@ -436,7 +470,7 @@ ar8xxx_mii_rmw(struct ar8xxx_priv *priv, int reg, u32 mask, u32 val)
        lo = ret & 0xffff;
        hi = (u16) (ret >> 16);
 
-       if (priv->mii_lo_first) {
+       if (priv->chip->mii_lo_first) {
                bus->write(bus, 0x10 | r2, r1, lo);
                bus->write(bus, 0x10 | r2, r1 + 1, hi);
        } else {
@@ -507,16 +541,11 @@ ar8xxx_reg_wait(struct ar8xxx_priv *priv, u32 reg, u32 mask, u32 val,
 static int
 ar8xxx_mib_op(struct ar8xxx_priv *priv, u32 op)
 {
-       unsigned mib_func;
+       unsigned mib_func = priv->chip->mib_func;
        int ret;
 
        lockdep_assert_held(&priv->mib_lock);
 
-       if (chip_is_ar8327(priv) || chip_is_ar8337(priv))
-               mib_func = AR8327_REG_MIB_FUNC;
-       else
-               mib_func = AR8216_REG_MIB_FUNC;
-
        /* Capture the hardware statistics for all ports */
        ar8xxx_rmw(priv, mib_func, AR8216_MIB_FUNC, (op << AR8216_MIB_FUNC_S));
 
@@ -554,13 +583,8 @@ ar8xxx_mib_fetch_port_stat(struct ar8xxx_priv *priv, int port, bool flush)
 
        lockdep_assert_held(&priv->mib_lock);
 
-       if (chip_is_ar8327(priv) || chip_is_ar8337(priv))
-               base = AR8327_REG_PORT_STATS_BASE(port);
-       else if (chip_is_ar8236(priv) ||
-                chip_is_ar8316(priv))
-               base = AR8236_REG_PORT_STATS_BASE(port);
-       else
-               base = AR8216_REG_PORT_STATS_BASE(port);
+       base = priv->chip->reg_port_stats_start +
+              priv->chip->reg_port_stats_length * port;
 
        mib_stats = &priv->mib_stats[port * priv->chip->num_mibs];
        for (i = 0; i < priv->chip->num_mibs; i++) {
@@ -859,22 +883,6 @@ ar8216_init_port(struct ar8xxx_priv *priv, int port)
        }
 }
 
-static const struct ar8xxx_chip ar8216_chip = {
-       .caps = AR8XXX_CAP_MIB_COUNTERS,
-
-       .hw_init = ar8216_hw_init,
-       .init_globals = ar8216_init_globals,
-       .init_port = ar8216_init_port,
-       .setup_port = ar8216_setup_port,
-       .read_port_status = ar8216_read_port_status,
-       .atu_flush = ar8216_atu_flush,
-       .vtu_flush = ar8216_vtu_flush,
-       .vtu_load_vlan = ar8216_vtu_load_vlan,
-
-       .num_mibs = ARRAY_SIZE(ar8216_mibs),
-       .mib_decs = ar8216_mibs,
-};
-
 static void
 ar8236_setup_port(struct ar8xxx_priv *priv, int port, u32 members)
 {
@@ -920,27 +928,21 @@ ar8236_init_globals(struct ar8xxx_priv *priv)
        ar8xxx_rmw(priv, AR8216_REG_GLOBAL_CTRL,
                   AR8316_GCTRL_MTU, 9018 + 8 + 2);
 
+       /* enable cpu port to receive arp frames */
+       ar8xxx_rmw(priv, AR8216_REG_ATU_CTRL,
+                  AR8236_ATU_CTRL_RES, AR8236_ATU_CTRL_RES);
+
+       /* enable cpu port to receive multicast and broadcast frames */
+       ar8xxx_rmw(priv, AR8216_REG_FLOOD_MASK,
+                  AR8236_FM_CPU_BROADCAST_EN | AR8236_FM_CPU_BCAST_FWD_EN,
+                  AR8236_FM_CPU_BROADCAST_EN | AR8236_FM_CPU_BCAST_FWD_EN);
+
        /* Enable MIB counters */
        ar8xxx_rmw(priv, AR8216_REG_MIB_FUNC, AR8216_MIB_FUNC | AR8236_MIB_EN,
                   (AR8216_MIB_FUNC_NO_OP << AR8216_MIB_FUNC_S) |
                   AR8236_MIB_EN);
 }
 
-static const struct ar8xxx_chip ar8236_chip = {
-       .caps = AR8XXX_CAP_MIB_COUNTERS,
-       .hw_init = ar8216_hw_init,
-       .init_globals = ar8236_init_globals,
-       .init_port = ar8216_init_port,
-       .setup_port = ar8236_setup_port,
-       .read_port_status = ar8216_read_port_status,
-       .atu_flush = ar8216_atu_flush,
-       .vtu_flush = ar8216_vtu_flush,
-       .vtu_load_vlan = ar8216_vtu_load_vlan,
-
-       .num_mibs = ARRAY_SIZE(ar8236_mibs),
-       .mib_decs = ar8236_mibs,
-};
-
 static int
 ar8316_hw_init(struct ar8xxx_priv *priv)
 {
@@ -1009,21 +1011,6 @@ ar8316_init_globals(struct ar8xxx_priv *priv)
                   AR8236_MIB_EN);
 }
 
-static const struct ar8xxx_chip ar8316_chip = {
-       .caps = AR8XXX_CAP_GIGE | AR8XXX_CAP_MIB_COUNTERS,
-       .hw_init = ar8316_hw_init,
-       .init_globals = ar8316_init_globals,
-       .init_port = ar8216_init_port,
-       .setup_port = ar8216_setup_port,
-       .read_port_status = ar8216_read_port_status,
-       .atu_flush = ar8216_atu_flush,
-       .vtu_flush = ar8216_vtu_flush,
-       .vtu_load_vlan = ar8216_vtu_load_vlan,
-
-       .num_mibs = ARRAY_SIZE(ar8236_mibs),
-       .mib_decs = ar8236_mibs,
-};
-
 static u32
 ar8327_get_pad_cfg(struct ar8327_pad_cfg *cfg)
 {
@@ -1345,7 +1332,7 @@ static DEVICE_ATTR(enable_hw_mode,  S_IRUGO | S_IWUSR,
                   ar8327_led_enable_hw_mode_store);
 
 static int
-ar8327_led_register(struct ar8xxx_priv *priv, struct ar8327_led *aled)
+ar8327_led_register(struct ar8327_led *aled)
 {
        int ret;
 
@@ -1381,7 +1368,7 @@ static int
 ar8327_led_create(struct ar8xxx_priv *priv,
                  const struct ar8327_led_info *led_info)
 {
-       struct ar8327_data *data = &priv->chip_data.ar8327;
+       struct ar8327_data *data = priv->chip_data;
        struct ar8327_led *aled;
        int ret;
 
@@ -1419,7 +1406,7 @@ ar8327_led_create(struct ar8xxx_priv *priv,
        mutex_init(&aled->mutex);
        INIT_WORK(&aled->led_work, ar8327_led_work_func);
 
-       ret = ar8327_led_register(priv, aled);
+       ret = ar8327_led_register(aled);
        if (ret)
                goto err_free;
 
@@ -1442,14 +1429,12 @@ ar8327_led_destroy(struct ar8327_led *aled)
 static void
 ar8327_leds_init(struct ar8xxx_priv *priv)
 {
-       struct ar8327_data *data;
+       struct ar8327_data *data = priv->chip_data;
        unsigned i;
 
        if (!IS_ENABLED(CONFIG_AR8216_PHY_LEDS))
                return;
 
-       data = &priv->chip_data.ar8327;
-
        for (i = 0; i < data->num_leds; i++) {
                struct ar8327_led *aled;
 
@@ -1467,7 +1452,7 @@ ar8327_leds_init(struct ar8xxx_priv *priv)
 static void
 ar8327_leds_cleanup(struct ar8xxx_priv *priv)
 {
-       struct ar8327_data *data = &priv->chip_data.ar8327;
+       struct ar8327_data *data = priv->chip_data;
        unsigned i;
 
        if (!IS_ENABLED(CONFIG_AR8216_PHY_LEDS))
@@ -1488,7 +1473,7 @@ ar8327_hw_config_pdata(struct ar8xxx_priv *priv,
                       struct ar8327_platform_data *pdata)
 {
        struct ar8327_led_cfg *led_cfg;
-       struct ar8327_data *data;
+       struct ar8327_data *data = priv->chip_data;
        u32 pos, new_pos;
        u32 t;
 
@@ -1497,8 +1482,6 @@ ar8327_hw_config_pdata(struct ar8xxx_priv *priv,
 
        priv->get_port_link = pdata->get_port_link;
 
-       data = &priv->chip_data.ar8327;
-
        data->port0_status = ar8327_get_port_init_status(&pdata->port0_cfg);
        data->port6_status = ar8327_get_port_init_status(&pdata->port6_cfg);
 
@@ -1571,6 +1554,7 @@ ar8327_hw_config_pdata(struct ar8xxx_priv *priv,
 static int
 ar8327_hw_config_of(struct ar8xxx_priv *priv, struct device_node *np)
 {
+       struct ar8327_data *data = priv->chip_data;
        const __be32 *paddr;
        int len;
        int i;
@@ -1590,10 +1574,10 @@ ar8327_hw_config_of(struct ar8xxx_priv *priv, struct device_node *np)
 
                switch (reg) {
                case AR8327_REG_PORT_STATUS(0):
-                       priv->chip_data.ar8327.port0_status = val;
+                       data->port0_status = val;
                        break;
                case AR8327_REG_PORT_STATUS(6):
-                       priv->chip_data.ar8327.port6_status = val;
+                       data->port6_status = val;
                        break;
                default:
                        priv->write(priv, reg, val);
@@ -1616,6 +1600,10 @@ ar8327_hw_init(struct ar8xxx_priv *priv)
 {
        int ret;
 
+       priv->chip_data = kzalloc(sizeof(struct ar8327_data), GFP_KERNEL);
+       if (!priv->chip_data)
+               return -ENOMEM;
+
        if (priv->phy->dev.of_node)
                ret = ar8327_hw_config_of(priv, priv->phy->dev.of_node);
        else
@@ -1675,12 +1663,13 @@ ar8327_init_globals(struct ar8xxx_priv *priv)
 static void
 ar8327_init_port(struct ar8xxx_priv *priv, int port)
 {
+       struct ar8327_data *data = priv->chip_data;
        u32 t;
 
        if (port == AR8216_PORT_CPU)
-               t = priv->chip_data.ar8327.port0_status;
+               t = data->port0_status;
        else if (port == 6)
-               t = priv->chip_data.ar8327.port6_status;
+               t = data->port6_status;
        else
                t = AR8216_PORT_STATUS_LINK_AUTO;
 
@@ -1795,23 +1784,6 @@ ar8327_setup_port(struct ar8xxx_priv *priv, int port, u32 members)
        priv->write(priv, AR8327_REG_PORT_LOOKUP(port), t);
 }
 
-static const struct ar8xxx_chip ar8327_chip = {
-       .caps = AR8XXX_CAP_GIGE | AR8XXX_CAP_MIB_COUNTERS,
-       .hw_init = ar8327_hw_init,
-       .cleanup = ar8327_cleanup,
-       .init_globals = ar8327_init_globals,
-       .init_port = ar8327_init_port,
-       .setup_port = ar8327_setup_port,
-       .read_port_status = ar8327_read_port_status,
-       .atu_flush = ar8327_atu_flush,
-       .vtu_flush = ar8327_vtu_flush,
-       .vtu_load_vlan = ar8327_vtu_load_vlan,
-       .phy_fixup = ar8327_phy_fixup,
-
-       .num_mibs = ARRAY_SIZE(ar8236_mibs),
-       .mib_decs = ar8236_mibs,
-};
-
 static int
 ar8xxx_sw_set_vlan(struct switch_dev *dev, const struct switch_attr *attr,
                   struct switch_val *val)
@@ -2067,16 +2039,6 @@ ar8216_set_mirror_regs(struct ar8xxx_priv *priv)
                           AR8216_PORT_CTRL_MIRROR_TX);
 }
 
-static void
-ar8xxx_set_mirror_regs(struct ar8xxx_priv *priv)
-{
-       if (chip_is_ar8327(priv) || chip_is_ar8337(priv)) {
-               ar8327_set_mirror_regs(priv);
-       } else {
-               ar8216_set_mirror_regs(priv);
-       }
-}
-
 static int
 ar8xxx_sw_hw_apply(struct switch_dev *dev)
 {
@@ -2124,7 +2086,7 @@ ar8xxx_sw_hw_apply(struct switch_dev *dev)
                priv->chip->setup_port(priv, i, portmask[i]);
        }
 
-       ar8xxx_set_mirror_regs(priv);
+       priv->chip->set_mirror_regs(priv);
 
        mutex_unlock(&priv->reg_mutex);
        return 0;
@@ -2196,7 +2158,7 @@ ar8xxx_sw_set_mirror_rx_enable(struct switch_dev *dev,
 
        mutex_lock(&priv->reg_mutex);
        priv->mirror_rx = !!val->value.i;
-       ar8xxx_set_mirror_regs(priv);
+       priv->chip->set_mirror_regs(priv);
        mutex_unlock(&priv->reg_mutex);
 
        return 0;
@@ -2221,7 +2183,7 @@ ar8xxx_sw_set_mirror_tx_enable(struct switch_dev *dev,
 
        mutex_lock(&priv->reg_mutex);
        priv->mirror_tx = !!val->value.i;
-       ar8xxx_set_mirror_regs(priv);
+       priv->chip->set_mirror_regs(priv);
        mutex_unlock(&priv->reg_mutex);
 
        return 0;
@@ -2246,7 +2208,7 @@ ar8xxx_sw_set_mirror_monitor_port(struct switch_dev *dev,
 
        mutex_lock(&priv->reg_mutex);
        priv->monitor_port = val->value.i;
-       ar8xxx_set_mirror_regs(priv);
+       priv->chip->set_mirror_regs(priv);
        mutex_unlock(&priv->reg_mutex);
 
        return 0;
@@ -2271,7 +2233,7 @@ ar8xxx_sw_set_mirror_source_port(struct switch_dev *dev,
 
        mutex_lock(&priv->reg_mutex);
        priv->source_port = val->value.i;
-       ar8xxx_set_mirror_regs(priv);
+       priv->chip->set_mirror_regs(priv);
        mutex_unlock(&priv->reg_mutex);
 
        return 0;
@@ -2534,6 +2496,144 @@ static const struct switch_dev_ops ar8327_sw_ops = {
        .get_port_link = ar8xxx_sw_get_port_link,
 };
 
+static const struct ar8xxx_chip ar8216_chip = {
+       .caps = AR8XXX_CAP_MIB_COUNTERS,
+
+       .reg_port_stats_start = 0x19000,
+       .reg_port_stats_length = 0xa0,
+
+       .name = "Atheros AR8216",
+       .ports = AR8216_NUM_PORTS,
+       .vlans = AR8216_NUM_VLANS,
+       .swops = &ar8xxx_sw_ops,
+
+       .hw_init = ar8216_hw_init,
+       .init_globals = ar8216_init_globals,
+       .init_port = ar8216_init_port,
+       .setup_port = ar8216_setup_port,
+       .read_port_status = ar8216_read_port_status,
+       .atu_flush = ar8216_atu_flush,
+       .vtu_flush = ar8216_vtu_flush,
+       .vtu_load_vlan = ar8216_vtu_load_vlan,
+       .set_mirror_regs = ar8216_set_mirror_regs,
+
+       .num_mibs = ARRAY_SIZE(ar8216_mibs),
+       .mib_decs = ar8216_mibs,
+       .mib_func = AR8216_REG_MIB_FUNC
+};
+
+static const struct ar8xxx_chip ar8236_chip = {
+       .caps = AR8XXX_CAP_MIB_COUNTERS,
+
+       .reg_port_stats_start = 0x20000,
+       .reg_port_stats_length = 0x100,
+
+       .name = "Atheros AR8236",
+       .ports = AR8216_NUM_PORTS,
+       .vlans = AR8216_NUM_VLANS,
+       .swops = &ar8xxx_sw_ops,
+
+       .hw_init = ar8216_hw_init,
+       .init_globals = ar8236_init_globals,
+       .init_port = ar8216_init_port,
+       .setup_port = ar8236_setup_port,
+       .read_port_status = ar8216_read_port_status,
+       .atu_flush = ar8216_atu_flush,
+       .vtu_flush = ar8216_vtu_flush,
+       .vtu_load_vlan = ar8216_vtu_load_vlan,
+       .set_mirror_regs = ar8216_set_mirror_regs,
+
+       .num_mibs = ARRAY_SIZE(ar8236_mibs),
+       .mib_decs = ar8236_mibs,
+       .mib_func = AR8216_REG_MIB_FUNC
+};
+
+static const struct ar8xxx_chip ar8316_chip = {
+       .caps = AR8XXX_CAP_GIGE | AR8XXX_CAP_MIB_COUNTERS,
+
+       .reg_port_stats_start = 0x20000,
+       .reg_port_stats_length = 0x100,
+
+       .name = "Atheros AR8316",
+       .ports = AR8216_NUM_PORTS,
+       .vlans = AR8X16_MAX_VLANS,
+       .swops = &ar8xxx_sw_ops,
+
+       .hw_init = ar8316_hw_init,
+       .init_globals = ar8316_init_globals,
+       .init_port = ar8216_init_port,
+       .setup_port = ar8216_setup_port,
+       .read_port_status = ar8216_read_port_status,
+       .atu_flush = ar8216_atu_flush,
+       .vtu_flush = ar8216_vtu_flush,
+       .vtu_load_vlan = ar8216_vtu_load_vlan,
+       .set_mirror_regs = ar8216_set_mirror_regs,
+
+       .num_mibs = ARRAY_SIZE(ar8236_mibs),
+       .mib_decs = ar8236_mibs,
+       .mib_func = AR8216_REG_MIB_FUNC
+};
+
+static const struct ar8xxx_chip ar8327_chip = {
+       .caps = AR8XXX_CAP_GIGE | AR8XXX_CAP_MIB_COUNTERS,
+       .config_at_probe = true,
+       .mii_lo_first = true,
+
+       .name = "Atheros AR8327",
+       .ports = AR8327_NUM_PORTS,
+       .vlans = AR8X16_MAX_VLANS,
+       .swops = &ar8327_sw_ops,
+
+       .reg_port_stats_start = 0x1000,
+       .reg_port_stats_length = 0x100,
+
+       .hw_init = ar8327_hw_init,
+       .cleanup = ar8327_cleanup,
+       .init_globals = ar8327_init_globals,
+       .init_port = ar8327_init_port,
+       .setup_port = ar8327_setup_port,
+       .read_port_status = ar8327_read_port_status,
+       .atu_flush = ar8327_atu_flush,
+       .vtu_flush = ar8327_vtu_flush,
+       .vtu_load_vlan = ar8327_vtu_load_vlan,
+       .phy_fixup = ar8327_phy_fixup,
+       .set_mirror_regs = ar8327_set_mirror_regs,
+
+       .num_mibs = ARRAY_SIZE(ar8236_mibs),
+       .mib_decs = ar8236_mibs,
+       .mib_func = AR8327_REG_MIB_FUNC
+};
+
+static const struct ar8xxx_chip ar8337_chip = {
+       .caps = AR8XXX_CAP_GIGE | AR8XXX_CAP_MIB_COUNTERS,
+       .config_at_probe = true,
+       .mii_lo_first = true,
+
+       .name = "Atheros AR8337",
+       .ports = AR8327_NUM_PORTS,
+       .vlans = AR8X16_MAX_VLANS,
+       .swops = &ar8327_sw_ops,
+
+       .reg_port_stats_start = 0x1000,
+       .reg_port_stats_length = 0x100,
+
+       .hw_init = ar8327_hw_init,
+       .cleanup = ar8327_cleanup,
+       .init_globals = ar8327_init_globals,
+       .init_port = ar8327_init_port,
+       .setup_port = ar8327_setup_port,
+       .read_port_status = ar8327_read_port_status,
+       .atu_flush = ar8327_atu_flush,
+       .vtu_flush = ar8327_vtu_flush,
+       .vtu_load_vlan = ar8327_vtu_load_vlan,
+       .phy_fixup = ar8327_phy_fixup,
+       .set_mirror_regs = ar8327_set_mirror_regs,
+
+       .num_mibs = ARRAY_SIZE(ar8236_mibs),
+       .mib_decs = ar8236_mibs,
+       .mib_func = AR8327_REG_MIB_FUNC
+};
+
 static int
 ar8xxx_id_chip(struct ar8xxx_priv *priv)
 {
@@ -2572,12 +2672,10 @@ ar8xxx_id_chip(struct ar8xxx_priv *priv)
                priv->chip = &ar8316_chip;
                break;
        case AR8XXX_VER_AR8327:
-               priv->mii_lo_first = true;
                priv->chip = &ar8327_chip;
                break;
        case AR8XXX_VER_AR8337:
-               priv->mii_lo_first = true;
-               priv->chip = &ar8327_chip;
+               priv->chip = &ar8337_chip;
                break;
        default:
                pr_err("ar8216: Unknown Atheros device [ver=%d, rev=%d]\n",
@@ -2676,6 +2774,7 @@ ar8xxx_free(struct ar8xxx_priv *priv)
        if (priv->chip && priv->chip->cleanup)
                priv->chip->cleanup(priv);
 
+       kfree(priv->chip_data);
        kfree(priv->mib_stats);
        kfree(priv);
 }
@@ -2699,6 +2798,7 @@ ar8xxx_create_mii(struct mii_bus *bus)
 static int
 ar8xxx_probe_switch(struct ar8xxx_priv *priv)
 {
+       const struct ar8xxx_chip *chip;
        struct switch_dev *swdev;
        int ret;
 
@@ -2706,33 +2806,14 @@ ar8xxx_probe_switch(struct ar8xxx_priv *priv)
        if (ret)
                return ret;
 
+       chip = priv->chip;
+
        swdev = &priv->dev;
        swdev->cpu_port = AR8216_PORT_CPU;
-       swdev->ops = &ar8xxx_sw_ops;
-
-       if (chip_is_ar8316(priv)) {
-               swdev->name = "Atheros AR8316";
-               swdev->vlans = AR8X16_MAX_VLANS;
-               swdev->ports = AR8216_NUM_PORTS;
-       } else if (chip_is_ar8236(priv)) {
-               swdev->name = "Atheros AR8236";
-               swdev->vlans = AR8216_NUM_VLANS;
-               swdev->ports = AR8216_NUM_PORTS;
-       } else if (chip_is_ar8327(priv)) {
-               swdev->name = "Atheros AR8327";
-               swdev->vlans = AR8X16_MAX_VLANS;
-               swdev->ports = AR8327_NUM_PORTS;
-               swdev->ops = &ar8327_sw_ops;
-       } else if (chip_is_ar8337(priv)) {
-               swdev->name = "Atheros AR8337";
-               swdev->vlans = AR8X16_MAX_VLANS;
-               swdev->ports = AR8327_NUM_PORTS;
-               swdev->ops = &ar8327_sw_ops;
-       } else {
-               swdev->name = "Atheros AR8216";
-               swdev->vlans = AR8216_NUM_VLANS;
-               swdev->ports = AR8216_NUM_PORTS;
-       }
+       swdev->name = chip->name;
+       swdev->vlans = chip->vlans;
+       swdev->ports = chip->ports;
+       swdev->ops = chip->swops;
 
        ret = ar8xxx_mib_init(priv);
        if (ret)
@@ -2773,8 +2854,8 @@ ar8xxx_phy_config_init(struct phy_device *phydev)
        if (WARN_ON(!priv))
                return -ENODEV;
 
-       if (chip_is_ar8327(priv) || chip_is_ar8337(priv))
-               return 0;
+       if (priv->chip->config_at_probe)
+               return ar8xxx_phy_check_aneg(phydev);
 
        priv->phy = phydev;
 
@@ -2848,6 +2929,15 @@ ar8xxx_phy_read_status(struct phy_device *phydev)
        return ret;
 }
 
+static int
+ar8xxx_phy_config_aneg(struct phy_device *phydev)
+{
+       if (phydev->addr == 0)
+               return 0;
+
+       return genphy_config_aneg(phydev);
+}
+
 static const u32 ar8xxx_phy_ids[] = {
        0x004dd033,
        0x004dd034, /* AR8327 */
@@ -2940,7 +3030,7 @@ found:
                        phydev->advertising = ADVERTISED_100baseT_Full;
                }
 
-               if (chip_is_ar8327(priv) || chip_is_ar8337(priv)) {
+               if (priv->chip->config_at_probe) {
                        priv->phy = phydev;
 
                        ret = ar8xxx_start(priv);
@@ -3010,6 +3100,15 @@ ar8xxx_phy_remove(struct phy_device *phydev)
        ar8xxx_free(priv);
 }
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)
+static int
+ar8xxx_phy_soft_reset(struct phy_device *phydev)
+{
+       /* we don't need an extra reset */
+       return 0;
+}
+#endif
+
 static struct phy_driver ar8xxx_phy_driver = {
        .phy_id         = 0x004d0000,
        .name           = "Atheros AR8216/AR8236/AR8316",
@@ -3019,8 +3118,11 @@ static struct phy_driver ar8xxx_phy_driver = {
        .remove         = ar8xxx_phy_remove,
        .detach         = ar8xxx_phy_detach,
        .config_init    = ar8xxx_phy_config_init,
-       .config_aneg    = genphy_config_aneg,
+       .config_aneg    = ar8xxx_phy_config_aneg,
        .read_status    = ar8xxx_phy_read_status,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)
+       .soft_reset     = ar8xxx_phy_soft_reset,
+#endif
        .driver         = { .owner = THIS_MODULE },
 };