generic: ar8216: add support for separated mdio bus for phy access
[openwrt/openwrt.git] / target / linux / generic / files / drivers / net / phy / ar8216.c
index d57f9e5e1486f3ae9c317435d3c2f9b9169271d9..e1c3dc95c30eb0ece265775a18c5222760ee79f4 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * ar8216.c: AR8216 switch driver
  *
- * Copyright (C) 2009 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2009 Felix Fietkau <nbd@nbd.name>
  * Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org>
  *
  * This program is free software; you can redistribute it and/or
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
 #include <linux/netlink.h>
+#include <linux/of_device.h>
+#include <linux/of_mdio.h>
+#include <linux/of_net.h>
 #include <linux/bitops.h>
 #include <net/genetlink.h>
 #include <linux/switch.h>
 #include <linux/delay.h>
 #include <linux/phy.h>
-#include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/lockdep.h>
 #include <linux/ar8216_platform.h>
 #include <linux/workqueue.h>
-#include <linux/of_device.h>
-#include <linux/leds.h>
-#include <linux/gpio.h>
+#include <linux/version.h>
 
 #include "ar8216.h"
 
-/* size of the vlan table */
-#define AR8X16_MAX_VLANS       128
-#define AR8X16_PROBE_RETRIES   10
-#define AR8X16_MAX_PORTS       8
+extern const struct ar8xxx_chip ar8327_chip;
+extern const struct ar8xxx_chip ar8337_chip;
 
 #define AR8XXX_MIB_WORK_DELAY  2000 /* msecs */
 
-struct ar8xxx_priv;
-
-#define AR8XXX_CAP_GIGE                        BIT(0)
-#define AR8XXX_CAP_MIB_COUNTERS                BIT(1)
-
-#define AR8XXX_NUM_PHYS        5
-
-enum {
-       AR8XXX_VER_AR8216 = 0x01,
-       AR8XXX_VER_AR8236 = 0x03,
-       AR8XXX_VER_AR8316 = 0x10,
-       AR8XXX_VER_AR8327 = 0x12,
-       AR8XXX_VER_AR8337 = 0x13,
-};
-
-struct ar8xxx_mib_desc {
-       unsigned int size;
-       unsigned int offset;
-       const char *name;
-};
-
-struct ar8xxx_chip {
-       unsigned long caps;
-
-       int (*hw_init)(struct ar8xxx_priv *priv);
-       void (*cleanup)(struct ar8xxx_priv *priv);
-
-       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);
-       u32 (*read_port_status)(struct ar8xxx_priv *priv, int port);
-       int (*atu_flush)(struct ar8xxx_priv *priv);
-       void (*vtu_flush)(struct ar8xxx_priv *priv);
-       void (*vtu_load_vlan)(struct ar8xxx_priv *priv, u32 vid, u32 port_mask);
-
-       const struct ar8xxx_mib_desc *mib_decs;
-       unsigned num_mibs;
-};
-
-enum ar8327_led_pattern {
-       AR8327_LED_PATTERN_OFF = 0,
-       AR8327_LED_PATTERN_BLINK,
-       AR8327_LED_PATTERN_ON,
-       AR8327_LED_PATTERN_RULE,
-};
-
-struct ar8327_led_entry {
-       unsigned reg;
-       unsigned shift;
-};
-
-struct ar8327_led {
-       struct led_classdev cdev;
-       struct ar8xxx_priv *sw_priv;
-
-       char *name;
-       bool active_low;
-       u8 led_num;
-       enum ar8327_led_mode mode;
-
-       struct mutex mutex;
-       spinlock_t lock;
-       struct work_struct led_work;
-       bool enable_hw_mode;
-       enum ar8327_led_pattern pattern;
-};
-
-struct ar8327_data {
-       u32 port0_status;
-       u32 port6_status;
-
-       struct ar8327_led **leds;
-       unsigned int num_leds;
-};
-
-struct ar8xxx_priv {
-       struct switch_dev dev;
-       struct mii_bus *mii_bus;
-       struct phy_device *phy;
-
-       u32 (*read)(struct ar8xxx_priv *priv, int reg);
-       void (*write)(struct ar8xxx_priv *priv, int reg, u32 val);
-       u32 (*rmw)(struct ar8xxx_priv *priv, int reg, u32 mask, u32 val);
-
-       int (*get_port_link)(unsigned port);
-
-       const struct net_device_ops *ndo_old;
-       struct net_device_ops ndo;
-       struct mutex reg_mutex;
-       u8 chip_ver;
-       u8 chip_rev;
-       const struct ar8xxx_chip *chip;
-       union {
-               struct ar8327_data ar8327;
-       } 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;
-       int mib_next_port;
-       u64 *mib_stats;
-
-       struct list_head list;
-       unsigned int use_count;
-
-       /* all fields below are cleared on reset */
-       bool vlan;
-       u16 vlan_id[AR8X16_MAX_VLANS];
-       u8 vlan_table[AR8X16_MAX_VLANS];
-       u8 vlan_tagged;
-       u16 pvid[AR8X16_MAX_PORTS];
-
-       /* mirroring */
-       bool mirror_rx;
-       bool mirror_tx;
-       int source_port;
-       int monitor_port;
-};
-
 #define MIB_DESC(_s , _o, _n)  \
        {                       \
                .size = (_s),   \
@@ -217,7 +91,7 @@ static const struct ar8xxx_mib_desc ar8216_mibs[] = {
        MIB_DESC(1, AR8216_STATS_TXLATECOL, "TxLateCol"),
 };
 
-static const struct ar8xxx_mib_desc ar8236_mibs[] = {
+const struct ar8xxx_mib_desc ar8236_mibs[39] = {
        MIB_DESC(1, AR8236_STATS_RXBROAD, "RxBroad"),
        MIB_DESC(1, AR8236_STATS_RXPAUSE, "RxPause"),
        MIB_DESC(1, AR8236_STATS_RXMULTI, "RxMulti"),
@@ -262,113 +136,149 @@ static const struct ar8xxx_mib_desc ar8236_mibs[] = {
 static DEFINE_MUTEX(ar8xxx_dev_list_lock);
 static LIST_HEAD(ar8xxx_dev_list);
 
-static inline struct ar8xxx_priv *
-swdev_to_ar8xxx(struct switch_dev *swdev)
-{
-       return container_of(swdev, struct ar8xxx_priv, dev);
+/* inspired by phy_poll_reset in drivers/net/phy/phy_device.c */
+static int
+ar8xxx_phy_poll_reset(struct mii_bus *bus)
+{
+        unsigned int sleep_msecs = 20;
+        int ret, elapsed, i;
+
+        for (elapsed = sleep_msecs; elapsed <= 600;
+            elapsed += sleep_msecs) {
+                msleep(sleep_msecs);
+                for (i = 0; i < AR8XXX_NUM_PHYS; i++) {
+                        ret = mdiobus_read(bus, i, MII_BMCR);
+                        if (ret < 0)
+                               return ret;
+                        if (ret & BMCR_RESET)
+                               break;
+                        if (i == AR8XXX_NUM_PHYS - 1) {
+                                usleep_range(1000, 2000);
+                                return 0;
+                        }
+                }
+        }
+        return -ETIMEDOUT;
 }
 
-static inline bool ar8xxx_has_gige(struct ar8xxx_priv *priv)
+static int
+ar8xxx_phy_check_aneg(struct phy_device *phydev)
 {
-       return priv->chip->caps & AR8XXX_CAP_GIGE;
-}
+       int ret;
 
-static inline bool ar8xxx_has_mib_counters(struct ar8xxx_priv *priv)
-{
-       return priv->chip->caps & AR8XXX_CAP_MIB_COUNTERS;
-}
+       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;
 
-static inline bool chip_is_ar8216(struct ar8xxx_priv *priv)
-{
-       return priv->chip_ver == AR8XXX_VER_AR8216;
+       dev_info(&phydev->mdio.dev, "ANEG disabled, re-enabling ...\n");
+       ret |= BMCR_ANENABLE | BMCR_ANRESTART;
+       return phy_write(phydev, MII_BMCR, ret);
 }
 
-static inline bool chip_is_ar8236(struct ar8xxx_priv *priv)
+void
+ar8xxx_phy_init(struct ar8xxx_priv *priv)
 {
-       return priv->chip_ver == AR8XXX_VER_AR8236;
-}
+       int i;
+       struct mii_bus *bus;
 
-static inline bool chip_is_ar8316(struct ar8xxx_priv *priv)
-{
-       return priv->chip_ver == AR8XXX_VER_AR8316;
-}
+       bus = priv->sw_mii_bus ?: priv->mii_bus;
+       for (i = 0; i < AR8XXX_NUM_PHYS; i++) {
+               if (priv->chip->phy_fixup)
+                       priv->chip->phy_fixup(priv, i);
 
-static inline bool chip_is_ar8327(struct ar8xxx_priv *priv)
-{
-       return priv->chip_ver == AR8XXX_VER_AR8327;
+               /* initialize the port itself */
+               mdiobus_write(bus, i, MII_ADVERTISE,
+                       ADVERTISE_ALL | ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM);
+               if (ar8xxx_has_gige(priv))
+                       mdiobus_write(bus, i, MII_CTRL1000, ADVERTISE_1000FULL);
+               mdiobus_write(bus, i, MII_BMCR, BMCR_RESET | BMCR_ANENABLE);
+       }
+
+       ar8xxx_phy_poll_reset(bus);
 }
 
-static inline bool chip_is_ar8337(struct ar8xxx_priv *priv)
+u32
+ar8xxx_mii_read32(struct ar8xxx_priv *priv, int phy_id, int regnum)
 {
-       return priv->chip_ver == AR8XXX_VER_AR8337;
+       struct mii_bus *bus = priv->mii_bus;
+       u16 lo, hi;
+
+       lo = bus->read(bus, phy_id, regnum);
+       hi = bus->read(bus, phy_id, regnum + 1);
+
+       return (hi << 16) | lo;
 }
 
-static inline void
-split_addr(u32 regaddr, u16 *r1, u16 *r2, u16 *page)
+void
+ar8xxx_mii_write32(struct ar8xxx_priv *priv, int phy_id, int regnum, u32 val)
 {
-       regaddr >>= 1;
-       *r1 = regaddr & 0x1e;
+       struct mii_bus *bus = priv->mii_bus;
+       u16 lo, hi;
 
-       regaddr >>= 5;
-       *r2 = regaddr & 0x7;
+       lo = val & 0xffff;
+       hi = (u16) (val >> 16);
 
-       regaddr >>= 3;
-       *page = regaddr & 0x1ff;
+       if (priv->chip->mii_lo_first)
+       {
+               bus->write(bus, phy_id, regnum, lo);
+               bus->write(bus, phy_id, regnum + 1, hi);
+       } else {
+               bus->write(bus, phy_id, regnum + 1, hi);
+               bus->write(bus, phy_id, regnum, lo);
+       }
 }
 
-static u32
-ar8xxx_mii_read(struct ar8xxx_priv *priv, int reg)
+u32
+ar8xxx_read(struct ar8xxx_priv *priv, int reg)
 {
        struct mii_bus *bus = priv->mii_bus;
        u16 r1, r2, page;
-       u16 lo, hi;
+       u32 val;
 
        split_addr((u32) reg, &r1, &r2, &page);
 
        mutex_lock(&bus->mdio_lock);
 
        bus->write(bus, 0x18, 0, page);
-       usleep_range(1000, 2000); /* wait for the page switch to propagate */
-       lo = bus->read(bus, 0x10 | r2, r1);
-       hi = bus->read(bus, 0x10 | r2, r1 + 1);
+       wait_for_page_switch();
+       val = ar8xxx_mii_read32(priv, 0x10 | r2, r1);
 
        mutex_unlock(&bus->mdio_lock);
 
-       return (hi << 16) | lo;
+       return val;
 }
 
-static void
-ar8xxx_mii_write(struct ar8xxx_priv *priv, int reg, u32 val)
+void
+ar8xxx_write(struct ar8xxx_priv *priv, int reg, u32 val)
 {
        struct mii_bus *bus = priv->mii_bus;
-       u16 r1, r2, r3;
-       u16 lo, hi;
+       u16 r1, r2, page;
 
-       split_addr((u32) reg, &r1, &r2, &r3);
-       lo = val & 0xffff;
-       hi = (u16) (val >> 16);
+       split_addr((u32) reg, &r1, &r2, &page);
 
        mutex_lock(&bus->mdio_lock);
 
-       bus->write(bus, 0x18, 0, r3);
-       usleep_range(1000, 2000); /* wait for the page switch to propagate */
-       if (priv->mii_lo_first) {
-               bus->write(bus, 0x10 | r2, r1, lo);
-               bus->write(bus, 0x10 | r2, r1 + 1, hi);
-       } else {
-               bus->write(bus, 0x10 | r2, r1 + 1, hi);
-               bus->write(bus, 0x10 | r2, r1, lo);
-       }
+       bus->write(bus, 0x18, 0, page);
+       wait_for_page_switch();
+       ar8xxx_mii_write32(priv, 0x10 | r2, r1, val);
 
        mutex_unlock(&bus->mdio_lock);
 }
 
-static u32
-ar8xxx_mii_rmw(struct ar8xxx_priv *priv, int reg, u32 mask, u32 val)
+u32
+ar8xxx_rmw(struct ar8xxx_priv *priv, int reg, u32 mask, u32 val)
 {
        struct mii_bus *bus = priv->mii_bus;
        u16 r1, r2, page;
-       u16 lo, hi;
        u32 ret;
 
        split_addr((u32) reg, &r1, &r2, &page);
@@ -376,33 +286,30 @@ ar8xxx_mii_rmw(struct ar8xxx_priv *priv, int reg, u32 mask, u32 val)
        mutex_lock(&bus->mdio_lock);
 
        bus->write(bus, 0x18, 0, page);
-       usleep_range(1000, 2000); /* wait for the page switch to propagate */
+       wait_for_page_switch();
 
-       lo = bus->read(bus, 0x10 | r2, r1);
-       hi = bus->read(bus, 0x10 | r2, r1 + 1);
-
-       ret = hi << 16 | lo;
+       ret = ar8xxx_mii_read32(priv, 0x10 | r2, r1);
        ret &= ~mask;
        ret |= val;
-
-       lo = ret & 0xffff;
-       hi = (u16) (ret >> 16);
-
-       if (priv->mii_lo_first) {
-               bus->write(bus, 0x10 | r2, r1, lo);
-               bus->write(bus, 0x10 | r2, r1 + 1, hi);
-       } else {
-               bus->write(bus, 0x10 | r2, r1 + 1, hi);
-               bus->write(bus, 0x10 | r2, r1, lo);
-       }
+       ar8xxx_mii_write32(priv, 0x10 | r2, r1, ret);
 
        mutex_unlock(&bus->mdio_lock);
 
        return ret;
 }
+void
+ar8xxx_phy_dbg_read(struct ar8xxx_priv *priv, int phy_addr,
+           u16 dbg_addr, u16 *dbg_data)
+{
+       struct mii_bus *bus = priv->mii_bus;
 
+       mutex_lock(&bus->mdio_lock);
+       bus->write(bus, phy_addr, MII_ATH_DBG_ADDR, dbg_addr);
+       *dbg_data = bus->read(bus, phy_addr, MII_ATH_DBG_DATA);
+       mutex_unlock(&bus->mdio_lock);
+}
 
-static void
+void
 ar8xxx_phy_dbg_write(struct ar8xxx_priv *priv, int phy_addr,
                     u16 dbg_addr, u16 dbg_data)
 {
@@ -414,27 +321,37 @@ ar8xxx_phy_dbg_write(struct ar8xxx_priv *priv, int phy_addr,
        mutex_unlock(&bus->mdio_lock);
 }
 
-static void
-ar8xxx_phy_mmd_write(struct ar8xxx_priv *priv, int phy_addr, u16 addr, u16 data)
+static inline void
+ar8xxx_phy_mmd_prep(struct mii_bus *bus, int phy_addr, u16 addr, u16 reg)
+{
+       bus->write(bus, phy_addr, MII_ATH_MMD_ADDR, addr);
+       bus->write(bus, phy_addr, MII_ATH_MMD_DATA, reg);
+       bus->write(bus, phy_addr, MII_ATH_MMD_ADDR, addr | 0x4000);
+}
+
+void
+ar8xxx_phy_mmd_write(struct ar8xxx_priv *priv, int phy_addr, u16 addr, u16 reg, u16 data)
 {
        struct mii_bus *bus = priv->mii_bus;
 
        mutex_lock(&bus->mdio_lock);
-       bus->write(bus, phy_addr, MII_ATH_MMD_ADDR, addr);
+       ar8xxx_phy_mmd_prep(bus, phy_addr, addr, reg);
        bus->write(bus, phy_addr, MII_ATH_MMD_DATA, data);
        mutex_unlock(&bus->mdio_lock);
 }
 
-static inline u32
-ar8xxx_rmw(struct ar8xxx_priv *priv, int reg, u32 mask, u32 val)
+u16
+ar8xxx_phy_mmd_read(struct ar8xxx_priv *priv, int phy_addr, u16 addr, u16 reg)
 {
-       return priv->rmw(priv, reg, mask, val);
-}
+       struct mii_bus *bus = priv->mii_bus;
+       u16 data;
 
-static inline void
-ar8xxx_reg_set(struct ar8xxx_priv *priv, int reg, u32 val)
-{
-       priv->rmw(priv, reg, 0, val);
+       mutex_lock(&bus->mdio_lock);
+       ar8xxx_phy_mmd_prep(bus, phy_addr, addr, reg);
+       data = bus->read(bus, phy_addr, MII_ATH_MMD_DATA);
+       mutex_unlock(&bus->mdio_lock);
+
+       return data;
 }
 
 static int
@@ -446,11 +363,12 @@ ar8xxx_reg_wait(struct ar8xxx_priv *priv, u32 reg, u32 mask, u32 val,
        for (i = 0; i < timeout; i++) {
                u32 t;
 
-               t = priv->read(priv, reg);
+               t = ar8xxx_read(priv, reg);
                if ((t & mask) == val)
                        return 0;
 
                usleep_range(1000, 2000);
+               cond_resched();
        }
 
        return -ETIMEDOUT;
@@ -459,16 +377,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));
 
@@ -506,13 +419,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++) {
@@ -520,11 +428,11 @@ ar8xxx_mib_fetch_port_stat(struct ar8xxx_priv *priv, int port, bool flush)
                u64 t;
 
                mib = &priv->chip->mib_decs[i];
-               t = priv->read(priv, base + mib->offset);
+               t = ar8xxx_read(priv, base + mib->offset);
                if (mib->size == 2) {
                        u64 hi;
 
-                       hi = priv->read(priv, base + mib->offset + 4);
+                       hi = ar8xxx_read(priv, base + mib->offset + 4);
                        t |= hi << 32;
                }
 
@@ -532,6 +440,7 @@ ar8xxx_mib_fetch_port_stat(struct ar8xxx_priv *priv, int port, bool flush)
                        mib_stats[i] = 0;
                else
                        mib_stats[i] += t;
+               cond_resched();
        }
 }
 
@@ -568,6 +477,9 @@ ar8216_read_port_link(struct ar8xxx_priv *priv, int port,
        link->tx_flow = !!(status & AR8216_PORT_STATUS_TXFLOW);
        link->rx_flow = !!(status & AR8216_PORT_STATUS_RXFLOW);
 
+       if (link->aneg && link->duplex && priv->chip->read_port_eee_status)
+               link->eee = priv->chip->read_port_eee_status(priv, port);
+
        speed = (status & AR8216_PORT_STATUS_SPEED) >>
                 AR8216_PORT_STATUS_SPEED_S;
 
@@ -639,7 +551,7 @@ ar8216_mangle_rx(struct net_device *dev, struct sk_buff *skb)
        if ((buf[12 + 2] != 0x81) || (buf[13 + 2] != 0x00))
                return;
 
-       port = buf[0] & 0xf;
+       port = buf[0] & 0x7;
 
        /* no need to fix up packets coming from a tagged source */
        if (priv->vlan_tagged & (1 << port))
@@ -653,14 +565,14 @@ ar8216_mangle_rx(struct net_device *dev, struct sk_buff *skb)
        buf[15 + 2] = vlan & 0xff;
 }
 
-static int
+int
 ar8216_wait_bit(struct ar8xxx_priv *priv, int reg, u32 mask, u32 val)
 {
        int timeout = 20;
        u32 t = 0;
 
        while (1) {
-               t = priv->read(priv, reg);
+               t = ar8xxx_read(priv, reg);
                if ((t & mask) == val)
                        return 0;
 
@@ -668,6 +580,7 @@ ar8216_wait_bit(struct ar8xxx_priv *priv, int reg, u32 mask, u32 val)
                        break;
 
                udelay(10);
+               cond_resched();
        }
 
        pr_err("ar8216: timeout on reg %08x: %08x & %08x != %08x\n",
@@ -683,10 +596,10 @@ ar8216_vtu_op(struct ar8xxx_priv *priv, u32 op, u32 val)
        if ((op & AR8216_VTU_OP) == AR8216_VTU_OP_LOAD) {
                val &= AR8216_VTUDATA_MEMBER;
                val |= AR8216_VTUDATA_VALID;
-               priv->write(priv, AR8216_REG_VTU_DATA, val);
+               ar8xxx_write(priv, AR8216_REG_VTU_DATA, val);
        }
        op |= AR8216_VTU_ACTIVE;
-       priv->write(priv, AR8216_REG_VTU, op);
+       ar8xxx_write(priv, AR8216_REG_VTU, op);
 }
 
 static void
@@ -709,9 +622,26 @@ ar8216_atu_flush(struct ar8xxx_priv *priv)
 {
        int ret;
 
-       ret = ar8216_wait_bit(priv, AR8216_REG_ATU, AR8216_ATU_ACTIVE, 0);
+       ret = ar8216_wait_bit(priv, AR8216_REG_ATU_FUNC0, AR8216_ATU_ACTIVE, 0);
        if (!ret)
-               priv->write(priv, AR8216_REG_ATU, AR8216_ATU_OP_FLUSH);
+               ar8xxx_write(priv, AR8216_REG_ATU_FUNC0, AR8216_ATU_OP_FLUSH |
+                                                        AR8216_ATU_ACTIVE);
+
+       return ret;
+}
+
+static int
+ar8216_atu_flush_port(struct ar8xxx_priv *priv, int port)
+{
+       u32 t;
+       int ret;
+
+       ret = ar8216_wait_bit(priv, AR8216_REG_ATU_FUNC0, AR8216_ATU_ACTIVE, 0);
+       if (!ret) {
+               t = (port << AR8216_ATU_PORT_NUM_S) | AR8216_ATU_OP_FLUSH_PORT;
+               t |= AR8216_ATU_ACTIVE;
+               ar8xxx_write(priv, AR8216_REG_ATU_FUNC0, t);
+       }
 
        return ret;
 }
@@ -719,7 +649,7 @@ ar8216_atu_flush(struct ar8xxx_priv *priv)
 static u32
 ar8216_read_port_status(struct ar8xxx_priv *priv, int port)
 {
-       return priv->read(priv, AR8216_REG_PORT_STATUS(port));
+       return ar8xxx_read(priv, AR8216_REG_PORT_STATUS(port));
 }
 
 static void
@@ -766,6 +696,12 @@ ar8216_setup_port(struct ar8xxx_priv *priv, int port, u32 members)
 static int
 ar8216_hw_init(struct ar8xxx_priv *priv)
 {
+       if (priv->initialized)
+               return 0;
+
+       ar8xxx_phy_init(priv);
+
+       priv->initialized = true;
        return 0;
 }
 
@@ -773,53 +709,190 @@ static void
 ar8216_init_globals(struct ar8xxx_priv *priv)
 {
        /* standard atheros magic */
-       priv->write(priv, 0x38, 0xc000050e);
+       ar8xxx_write(priv, 0x38, 0xc000050e);
 
        ar8xxx_rmw(priv, AR8216_REG_GLOBAL_CTRL,
                   AR8216_GCTRL_MTU, 1518 + 8 + 2);
 }
 
 static void
-ar8216_init_port(struct ar8xxx_priv *priv, int port)
+__ar8216_init_port(struct ar8xxx_priv *priv, int port,
+                  bool cpu_ge, bool flow_en)
 {
        /* Enable port learning and tx */
-       priv->write(priv, AR8216_REG_PORT_CTRL(port),
+       ar8xxx_write(priv, AR8216_REG_PORT_CTRL(port),
                AR8216_PORT_CTRL_LEARN |
                (4 << AR8216_PORT_CTRL_STATE_S));
 
-       priv->write(priv, AR8216_REG_PORT_VLAN(port), 0);
+       ar8xxx_write(priv, AR8216_REG_PORT_VLAN(port), 0);
 
        if (port == AR8216_PORT_CPU) {
-               priv->write(priv, AR8216_REG_PORT_STATUS(port),
+               ar8xxx_write(priv, AR8216_REG_PORT_STATUS(port),
                        AR8216_PORT_STATUS_LINK_UP |
-                       (ar8xxx_has_gige(priv) ?
-                                AR8216_PORT_SPEED_1000M : AR8216_PORT_SPEED_100M) |
+                       (cpu_ge ? AR8216_PORT_SPEED_1000M : AR8216_PORT_SPEED_100M) |
                        AR8216_PORT_STATUS_TXMAC |
                        AR8216_PORT_STATUS_RXMAC |
-                       (chip_is_ar8316(priv) ? AR8216_PORT_STATUS_RXFLOW : 0) |
-                       (chip_is_ar8316(priv) ? AR8216_PORT_STATUS_TXFLOW : 0) |
+                       (flow_en ? AR8216_PORT_STATUS_RXFLOW : 0) |
+                       (flow_en ? AR8216_PORT_STATUS_TXFLOW : 0) |
                        AR8216_PORT_STATUS_DUPLEX);
        } else {
-               priv->write(priv, AR8216_REG_PORT_STATUS(port),
+               ar8xxx_write(priv, AR8216_REG_PORT_STATUS(port),
                        AR8216_PORT_STATUS_LINK_AUTO);
        }
 }
 
-static const struct ar8xxx_chip ar8216_chip = {
-       .caps = AR8XXX_CAP_MIB_COUNTERS,
+static void
+ar8216_init_port(struct ar8xxx_priv *priv, int port)
+{
+       __ar8216_init_port(priv, port, ar8xxx_has_gige(priv),
+                          chip_is_ar8316(priv));
+}
 
-       .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,
+static void
+ar8216_wait_atu_ready(struct ar8xxx_priv *priv, u16 r2, u16 r1)
+{
+       int timeout = 20;
 
-       .num_mibs = ARRAY_SIZE(ar8216_mibs),
-       .mib_decs = ar8216_mibs,
-};
+       while (ar8xxx_mii_read32(priv, r2, r1) & AR8216_ATU_ACTIVE && --timeout) {
+               udelay(10);
+               cond_resched();
+       }
+
+       if (!timeout)
+               pr_err("ar8216: timeout waiting for atu to become ready\n");
+}
+
+static void ar8216_get_arl_entry(struct ar8xxx_priv *priv,
+                                struct arl_entry *a, u32 *status, enum arl_op op)
+{
+       struct mii_bus *bus = priv->mii_bus;
+       u16 r2, page;
+       u16 r1_func0, r1_func1, r1_func2;
+       u32 t, val0, val1, val2;
+
+       split_addr(AR8216_REG_ATU_FUNC0, &r1_func0, &r2, &page);
+       r2 |= 0x10;
+
+       r1_func1 = (AR8216_REG_ATU_FUNC1 >> 1) & 0x1e;
+       r1_func2 = (AR8216_REG_ATU_FUNC2 >> 1) & 0x1e;
+
+       switch (op) {
+       case AR8XXX_ARL_INITIALIZE:
+               /* all ATU registers are on the same page
+               * therefore set page only once
+               */
+               bus->write(bus, 0x18, 0, page);
+               wait_for_page_switch();
+
+               ar8216_wait_atu_ready(priv, r2, r1_func0);
+
+               ar8xxx_mii_write32(priv, r2, r1_func0, AR8216_ATU_OP_GET_NEXT);
+               ar8xxx_mii_write32(priv, r2, r1_func1, 0);
+               ar8xxx_mii_write32(priv, r2, r1_func2, 0);
+               break;
+       case AR8XXX_ARL_GET_NEXT:
+               t = ar8xxx_mii_read32(priv, r2, r1_func0);
+               t |= AR8216_ATU_ACTIVE;
+               ar8xxx_mii_write32(priv, r2, r1_func0, t);
+               ar8216_wait_atu_ready(priv, r2, r1_func0);
+
+               val0 = ar8xxx_mii_read32(priv, r2, r1_func0);
+               val1 = ar8xxx_mii_read32(priv, r2, r1_func1);
+               val2 = ar8xxx_mii_read32(priv, r2, r1_func2);
+
+               *status = (val2 & AR8216_ATU_STATUS) >> AR8216_ATU_STATUS_S;
+               if (!*status)
+                       break;
+
+               a->portmap = (val2 & AR8216_ATU_PORTS) >> AR8216_ATU_PORTS_S;
+               a->mac[0] = (val0 & AR8216_ATU_ADDR5) >> AR8216_ATU_ADDR5_S;
+               a->mac[1] = (val0 & AR8216_ATU_ADDR4) >> AR8216_ATU_ADDR4_S;
+               a->mac[2] = (val1 & AR8216_ATU_ADDR3) >> AR8216_ATU_ADDR3_S;
+               a->mac[3] = (val1 & AR8216_ATU_ADDR2) >> AR8216_ATU_ADDR2_S;
+               a->mac[4] = (val1 & AR8216_ATU_ADDR1) >> AR8216_ATU_ADDR1_S;
+               a->mac[5] = (val1 & AR8216_ATU_ADDR0) >> AR8216_ATU_ADDR0_S;
+               break;
+       }
+}
+
+static int
+ar8229_hw_init(struct ar8xxx_priv *priv)
+{
+       int phy_if_mode;
+
+       if (priv->initialized)
+               return 0;
+
+       ar8xxx_write(priv, AR8216_REG_CTRL, AR8216_CTRL_RESET);
+       ar8xxx_reg_wait(priv, AR8216_REG_CTRL, AR8216_CTRL_RESET, 0, 1000);
+
+       phy_if_mode = of_get_phy_mode(priv->pdev->of_node);
+
+       if (phy_if_mode == PHY_INTERFACE_MODE_GMII) {
+               ar8xxx_write(priv, AR8229_REG_OPER_MODE0,
+                                AR8229_OPER_MODE0_MAC_GMII_EN);
+       } else if (phy_if_mode == PHY_INTERFACE_MODE_MII) {
+               ar8xxx_write(priv, AR8229_REG_OPER_MODE0,
+                                AR8229_OPER_MODE0_PHY_MII_EN);
+       } else {
+               pr_err("ar8229: unsupported mii mode\n");
+               return -EINVAL;
+       }
+
+       if (priv->port4_phy)
+               ar8xxx_write(priv, AR8229_REG_OPER_MODE1,
+                            AR8229_REG_OPER_MODE1_PHY4_MII_EN);
+
+       ar8xxx_phy_init(priv);
+
+       priv->initialized = true;
+       return 0;
+}
+
+static void
+ar8229_init_globals(struct ar8xxx_priv *priv)
+{
+
+       /* Enable CPU port, and disable mirror port */
+       ar8xxx_write(priv, AR8216_REG_GLOBAL_CPUPORT,
+                    AR8216_GLOBAL_CPUPORT_EN |
+                    (15 << AR8216_GLOBAL_CPUPORT_MIRROR_PORT_S));
+
+       /* Setup TAG priority mapping */
+       ar8xxx_write(priv, AR8216_REG_TAG_PRIORITY, 0xfa50);
+
+       /* Enable aging, MAC replacing */
+       ar8xxx_write(priv, AR8216_REG_ATU_CTRL,
+                    0x2b /* 5 min age time */ |
+                    AR8216_ATU_CTRL_AGE_EN |
+                    AR8216_ATU_CTRL_LEARN_CHANGE);
+
+       /* Enable ARP frame acknowledge */
+       ar8xxx_reg_set(priv, AR8229_REG_QM_CTRL,
+                      AR8229_QM_CTRL_ARP_EN);
+
+       /* Enable Broadcast/Multicast frames transmitted to the CPU */
+       ar8xxx_reg_set(priv, AR8216_REG_FLOOD_MASK,
+                      AR8229_FLOOD_MASK_BC_DP(0) |
+                      AR8229_FLOOD_MASK_MC_DP(0));
+
+       /* setup MTU */
+       ar8xxx_rmw(priv, AR8216_REG_GLOBAL_CTRL,
+                  AR8236_GCTRL_MTU, AR8236_GCTRL_MTU);
+
+       /* Enable MIB counters */
+       ar8xxx_reg_set(priv, AR8216_REG_MIB_FUNC,
+                      AR8236_MIB_EN);
+
+       /* setup Service TAG */
+       ar8xxx_rmw(priv, AR8216_REG_SERVICE_TAG, AR8216_SERVICE_TAG_M, 0);
+}
+
+static void
+ar8229_init_port(struct ar8xxx_priv *priv, int port)
+{
+       __ar8216_init_port(priv, port, true, true);
+}
 
 static void
 ar8236_setup_port(struct ar8xxx_priv *priv, int port, u32 members)
@@ -859,29 +932,6 @@ ar8236_setup_port(struct ar8xxx_priv *priv, int port, u32 members)
                   (members << AR8236_PORT_VLAN2_MEMBER_S));
 }
 
-static int
-ar8236_hw_init(struct ar8xxx_priv *priv)
-{
-       int i;
-       struct mii_bus *bus;
-
-       if (priv->initialized)
-               return 0;
-
-       /* Initialize the PHYs */
-       bus = priv->mii_bus;
-       for (i = 0; i < AR8XXX_NUM_PHYS; i++) {
-               mdiobus_write(bus, i, MII_ADVERTISE,
-                             ADVERTISE_ALL | ADVERTISE_PAUSE_CAP |
-                             ADVERTISE_PAUSE_ASYM);
-               mdiobus_write(bus, i, MII_BMCR, BMCR_RESET | BMCR_ANENABLE);
-       }
-       msleep(1000);
-
-       priv->initialized = true;
-       return 0;
-}
-
 static void
 ar8236_init_globals(struct ar8xxx_priv *priv)
 {
@@ -889,35 +939,26 @@ 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_reg_set(priv, AR8216_REG_ATU_CTRL,
+                  AR8236_ATU_CTRL_RES);
+
+       /* enable cpu port to receive multicast and broadcast frames */
+       ar8xxx_reg_set(priv, AR8216_REG_FLOOD_MASK,
+                  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 = ar8236_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)
 {
-       int i;
        u32 val, newval;
-       struct mii_bus *bus;
 
-       val = priv->read(priv, AR8316_REG_POSTRIP);
+       val = ar8xxx_read(priv, AR8316_REG_POSTRIP);
 
        if (priv->phy->interface == PHY_INTERFACE_MODE_RGMII) {
                if (priv->port4_phy) {
@@ -941,7 +982,7 @@ ar8316_hw_init(struct ar8xxx_priv *priv)
        if (val == newval)
                goto out;
 
-       priv->write(priv, AR8316_REG_POSTRIP, newval);
+       ar8xxx_write(priv, AR8316_REG_POSTRIP, newval);
 
        if (priv->port4_phy &&
            priv->phy->interface == PHY_INTERFACE_MODE_RGMII) {
@@ -954,17 +995,7 @@ ar8316_hw_init(struct ar8xxx_priv *priv)
                msleep(1000);
        }
 
-       /* Initialize the ports */
-       bus = priv->mii_bus;
-       for (i = 0; i < AR8XXX_NUM_PHYS; i++) {
-               /* initialize the port itself */
-               mdiobus_write(bus, i, MII_ADVERTISE,
-                       ADVERTISE_ALL | ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM);
-               mdiobus_write(bus, i, MII_CTRL1000, ADVERTISE_1000FULL);
-               mdiobus_write(bus, i, MII_BMCR, BMCR_RESET | BMCR_ANENABLE);
-       }
-
-       msleep(1000);
+       ar8xxx_phy_init(priv);
 
 out:
        priv->initialized = true;
@@ -975,10 +1006,10 @@ static void
 ar8316_init_globals(struct ar8xxx_priv *priv)
 {
        /* standard atheros magic */
-       priv->write(priv, 0x38, 0xc000050e);
+       ar8xxx_write(priv, 0x38, 0xc000050e);
 
        /* enable cpu port to receive multicast and broadcast frames */
-       priv->write(priv, AR8216_REG_FLOOD_MASK, 0x003f003f);
+       ar8xxx_write(priv, AR8216_REG_FLOOD_MASK, 0x003f003f);
 
        /* enable jumbo frames */
        ar8xxx_rmw(priv, AR8216_REG_GLOBAL_CTRL,
@@ -990,823 +1021,7 @@ 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)
-{
-       u32 t;
-
-       if (!cfg)
-               return 0;
-
-       t = 0;
-       switch (cfg->mode) {
-       case AR8327_PAD_NC:
-               break;
-
-       case AR8327_PAD_MAC2MAC_MII:
-               t = AR8327_PAD_MAC_MII_EN;
-               if (cfg->rxclk_sel)
-                       t |= AR8327_PAD_MAC_MII_RXCLK_SEL;
-               if (cfg->txclk_sel)
-                       t |= AR8327_PAD_MAC_MII_TXCLK_SEL;
-               break;
-
-       case AR8327_PAD_MAC2MAC_GMII:
-               t = AR8327_PAD_MAC_GMII_EN;
-               if (cfg->rxclk_sel)
-                       t |= AR8327_PAD_MAC_GMII_RXCLK_SEL;
-               if (cfg->txclk_sel)
-                       t |= AR8327_PAD_MAC_GMII_TXCLK_SEL;
-               break;
-
-       case AR8327_PAD_MAC_SGMII:
-               t = AR8327_PAD_SGMII_EN;
-
-               /*
-                * WAR for the QUalcomm Atheros AP136 board.
-                * It seems that RGMII TX/RX delay settings needs to be
-                * applied for SGMII mode as well, The ethernet is not
-                * reliable without this.
-                */
-               t |= cfg->txclk_delay_sel << AR8327_PAD_RGMII_TXCLK_DELAY_SEL_S;
-               t |= cfg->rxclk_delay_sel << AR8327_PAD_RGMII_RXCLK_DELAY_SEL_S;
-               if (cfg->rxclk_delay_en)
-                       t |= AR8327_PAD_RGMII_RXCLK_DELAY_EN;
-               if (cfg->txclk_delay_en)
-                       t |= AR8327_PAD_RGMII_TXCLK_DELAY_EN;
-
-               if (cfg->sgmii_delay_en)
-                       t |= AR8327_PAD_SGMII_DELAY_EN;
-
-               break;
-
-       case AR8327_PAD_MAC2PHY_MII:
-               t = AR8327_PAD_PHY_MII_EN;
-               if (cfg->rxclk_sel)
-                       t |= AR8327_PAD_PHY_MII_RXCLK_SEL;
-               if (cfg->txclk_sel)
-                       t |= AR8327_PAD_PHY_MII_TXCLK_SEL;
-               break;
-
-       case AR8327_PAD_MAC2PHY_GMII:
-               t = AR8327_PAD_PHY_GMII_EN;
-               if (cfg->pipe_rxclk_sel)
-                       t |= AR8327_PAD_PHY_GMII_PIPE_RXCLK_SEL;
-               if (cfg->rxclk_sel)
-                       t |= AR8327_PAD_PHY_GMII_RXCLK_SEL;
-               if (cfg->txclk_sel)
-                       t |= AR8327_PAD_PHY_GMII_TXCLK_SEL;
-               break;
-
-       case AR8327_PAD_MAC_RGMII:
-               t = AR8327_PAD_RGMII_EN;
-               t |= cfg->txclk_delay_sel << AR8327_PAD_RGMII_TXCLK_DELAY_SEL_S;
-               t |= cfg->rxclk_delay_sel << AR8327_PAD_RGMII_RXCLK_DELAY_SEL_S;
-               if (cfg->rxclk_delay_en)
-                       t |= AR8327_PAD_RGMII_RXCLK_DELAY_EN;
-               if (cfg->txclk_delay_en)
-                       t |= AR8327_PAD_RGMII_TXCLK_DELAY_EN;
-               break;
-
-       case AR8327_PAD_PHY_GMII:
-               t = AR8327_PAD_PHYX_GMII_EN;
-               break;
-
-       case AR8327_PAD_PHY_RGMII:
-               t = AR8327_PAD_PHYX_RGMII_EN;
-               break;
-
-       case AR8327_PAD_PHY_MII:
-               t = AR8327_PAD_PHYX_MII_EN;
-               break;
-       }
-
-       return t;
-}
-
-static void
-ar8327_phy_fixup(struct ar8xxx_priv *priv, int phy)
-{
-       switch (priv->chip_rev) {
-       case 1:
-               /* For 100M waveform */
-               ar8xxx_phy_dbg_write(priv, phy, 0, 0x02ea);
-               /* Turn on Gigabit clock */
-               ar8xxx_phy_dbg_write(priv, phy, 0x3d, 0x68a0);
-               break;
-
-       case 2:
-               ar8xxx_phy_mmd_write(priv, phy, 0x7, 0x3c);
-               ar8xxx_phy_mmd_write(priv, phy, 0x4007, 0x0);
-               /* fallthrough */
-       case 4:
-               ar8xxx_phy_mmd_write(priv, phy, 0x3, 0x800d);
-               ar8xxx_phy_mmd_write(priv, phy, 0x4003, 0x803f);
-
-               ar8xxx_phy_dbg_write(priv, phy, 0x3d, 0x6860);
-               ar8xxx_phy_dbg_write(priv, phy, 0x5, 0x2c46);
-               ar8xxx_phy_dbg_write(priv, phy, 0x3c, 0x6000);
-               break;
-       }
-}
-
-static u32
-ar8327_get_port_init_status(struct ar8327_port_cfg *cfg)
-{
-       u32 t;
-
-       if (!cfg->force_link)
-               return AR8216_PORT_STATUS_LINK_AUTO;
-
-       t = AR8216_PORT_STATUS_TXMAC | AR8216_PORT_STATUS_RXMAC;
-       t |= cfg->duplex ? AR8216_PORT_STATUS_DUPLEX : 0;
-       t |= cfg->rxpause ? AR8216_PORT_STATUS_RXFLOW : 0;
-       t |= cfg->txpause ? AR8216_PORT_STATUS_TXFLOW : 0;
-
-       switch (cfg->speed) {
-       case AR8327_PORT_SPEED_10:
-               t |= AR8216_PORT_SPEED_10M;
-               break;
-       case AR8327_PORT_SPEED_100:
-               t |= AR8216_PORT_SPEED_100M;
-               break;
-       case AR8327_PORT_SPEED_1000:
-               t |= AR8216_PORT_SPEED_1000M;
-               break;
-       }
-
-       return t;
-}
-
-#define AR8327_LED_ENTRY(_num, _reg, _shift) \
-       [_num] = { .reg = (_reg), .shift = (_shift) }
-
-static const struct ar8327_led_entry
-ar8327_led_map[AR8327_NUM_LEDS] = {
-       AR8327_LED_ENTRY(AR8327_LED_PHY0_0, 0, 14),
-       AR8327_LED_ENTRY(AR8327_LED_PHY0_1, 1, 14),
-       AR8327_LED_ENTRY(AR8327_LED_PHY0_2, 2, 14),
-
-       AR8327_LED_ENTRY(AR8327_LED_PHY1_0, 3, 8),
-       AR8327_LED_ENTRY(AR8327_LED_PHY1_1, 3, 10),
-       AR8327_LED_ENTRY(AR8327_LED_PHY1_2, 3, 12),
-
-       AR8327_LED_ENTRY(AR8327_LED_PHY2_0, 3, 14),
-       AR8327_LED_ENTRY(AR8327_LED_PHY2_1, 3, 16),
-       AR8327_LED_ENTRY(AR8327_LED_PHY2_2, 3, 18),
-
-       AR8327_LED_ENTRY(AR8327_LED_PHY3_0, 3, 20),
-       AR8327_LED_ENTRY(AR8327_LED_PHY3_1, 3, 22),
-       AR8327_LED_ENTRY(AR8327_LED_PHY3_2, 3, 24),
-
-       AR8327_LED_ENTRY(AR8327_LED_PHY4_0, 0, 30),
-       AR8327_LED_ENTRY(AR8327_LED_PHY4_1, 1, 30),
-       AR8327_LED_ENTRY(AR8327_LED_PHY4_2, 2, 30),
-};
-
-static void
-ar8327_set_led_pattern(struct ar8xxx_priv *priv, unsigned int led_num,
-                      enum ar8327_led_pattern pattern)
-{
-       const struct ar8327_led_entry *entry;
-
-       entry = &ar8327_led_map[led_num];
-       ar8xxx_rmw(priv, AR8327_REG_LED_CTRL(entry->reg),
-                  (3 << entry->shift), pattern << entry->shift);
-}
-
-static void
-ar8327_led_work_func(struct work_struct *work)
-{
-       struct ar8327_led *aled;
-       u8 pattern;
-
-       aled = container_of(work, struct ar8327_led, led_work);
-
-       spin_lock(&aled->lock);
-       pattern = aled->pattern;
-       spin_unlock(&aled->lock);
-
-       ar8327_set_led_pattern(aled->sw_priv, aled->led_num,
-                              pattern);
-}
-
-static void
-ar8327_led_schedule_change(struct ar8327_led *aled, u8 pattern)
-{
-       if (aled->pattern == pattern)
-               return;
-
-       aled->pattern = pattern;
-       schedule_work(&aled->led_work);
-}
-
-static inline struct ar8327_led *
-led_cdev_to_ar8327_led(struct led_classdev *led_cdev)
-{
-       return container_of(led_cdev, struct ar8327_led, cdev);
-}
-
-static int
-ar8327_led_blink_set(struct led_classdev *led_cdev,
-                    unsigned long *delay_on,
-                    unsigned long *delay_off)
-{
-       struct ar8327_led *aled = led_cdev_to_ar8327_led(led_cdev);
-
-       if (*delay_on == 0 && *delay_off == 0) {
-               *delay_on = 125;
-               *delay_off = 125;
-       }
-
-       if (*delay_on != 125 || *delay_off != 125) {
-               /*
-                * The hardware only supports blinking at 4Hz. Fall back
-                * to software implementation in other cases.
-                */
-               return -EINVAL;
-       }
-
-       spin_lock(&aled->lock);
-
-       aled->enable_hw_mode = false;
-       ar8327_led_schedule_change(aled, AR8327_LED_PATTERN_BLINK);
-
-       spin_unlock(&aled->lock);
-
-       return 0;
-}
-
-static void
-ar8327_led_set_brightness(struct led_classdev *led_cdev,
-                         enum led_brightness brightness)
-{
-       struct ar8327_led *aled = led_cdev_to_ar8327_led(led_cdev);
-       u8 pattern;
-       bool active;
-
-       active = (brightness != LED_OFF);
-       active ^= aled->active_low;
-
-       pattern = (active) ? AR8327_LED_PATTERN_ON :
-                            AR8327_LED_PATTERN_OFF;
-
-       spin_lock(&aled->lock);
-
-       aled->enable_hw_mode = false;
-       ar8327_led_schedule_change(aled, pattern);
-
-       spin_unlock(&aled->lock);
-}
-
-static ssize_t
-ar8327_led_enable_hw_mode_show(struct device *dev,
-                              struct device_attribute *attr,
-                              char *buf)
-{
-       struct led_classdev *led_cdev = dev_get_drvdata(dev);
-       struct ar8327_led *aled = led_cdev_to_ar8327_led(led_cdev);
-       ssize_t ret = 0;
-
-       spin_lock(&aled->lock);
-       ret += sprintf(buf, "%d\n", aled->enable_hw_mode);
-       spin_unlock(&aled->lock);
-
-       return ret;
-}
-
-static ssize_t
-ar8327_led_enable_hw_mode_store(struct device *dev,
-                               struct device_attribute *attr,
-                               const char *buf,
-                               size_t size)
-{
-        struct led_classdev *led_cdev = dev_get_drvdata(dev);
-       struct ar8327_led *aled = led_cdev_to_ar8327_led(led_cdev);
-       u8 pattern;
-       u8 value;
-       int ret;
-
-       ret = kstrtou8(buf, 10, &value);
-       if (ret < 0)
-               return -EINVAL;
-
-       spin_lock(&aled->lock);
-
-       aled->enable_hw_mode = !!value;
-       if (aled->enable_hw_mode)
-               pattern = AR8327_LED_PATTERN_RULE;
-       else
-               pattern = AR8327_LED_PATTERN_OFF;
-
-       ar8327_led_schedule_change(aled, pattern);
-
-       spin_unlock(&aled->lock);
-
-       return size;
-}
-
-static DEVICE_ATTR(enable_hw_mode,  S_IRUGO | S_IWUSR,
-                  ar8327_led_enable_hw_mode_show,
-                  ar8327_led_enable_hw_mode_store);
-
-static int
-ar8327_led_register(struct ar8xxx_priv *priv, struct ar8327_led *aled)
-{
-       int ret;
-
-       ret = led_classdev_register(NULL, &aled->cdev);
-       if (ret < 0)
-               return ret;
-
-       if (aled->mode == AR8327_LED_MODE_HW) {
-               ret = device_create_file(aled->cdev.dev,
-                                        &dev_attr_enable_hw_mode);
-               if (ret)
-                       goto err_unregister;
-       }
-
-       return 0;
-
-err_unregister:
-       led_classdev_unregister(&aled->cdev);
-       return ret;
-}
-
-static void
-ar8327_led_unregister(struct ar8327_led *aled)
-{
-       if (aled->mode == AR8327_LED_MODE_HW)
-               device_remove_file(aled->cdev.dev, &dev_attr_enable_hw_mode);
-
-       led_classdev_unregister(&aled->cdev);
-       cancel_work_sync(&aled->led_work);
-}
-
-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_led *aled;
-       int ret;
-
-       if (!IS_ENABLED(CONFIG_AR8216_PHY_LEDS))
-               return 0;
-
-       if (!led_info->name)
-               return -EINVAL;
-
-       if (led_info->led_num >= AR8327_NUM_LEDS)
-               return -EINVAL;
-
-       aled = kzalloc(sizeof(*aled) + strlen(led_info->name) + 1,
-                      GFP_KERNEL);
-       if (!aled)
-               return -ENOMEM;
-
-       aled->sw_priv = priv;
-       aled->led_num = led_info->led_num;
-       aled->active_low = led_info->active_low;
-       aled->mode = led_info->mode;
-
-       if (aled->mode == AR8327_LED_MODE_HW)
-               aled->enable_hw_mode = true;
-
-       aled->name = (char *)(aled + 1);
-       strcpy(aled->name, led_info->name);
-
-       aled->cdev.name = aled->name;
-       aled->cdev.brightness_set = ar8327_led_set_brightness;
-       aled->cdev.blink_set = ar8327_led_blink_set;
-       aled->cdev.default_trigger = led_info->default_trigger;
-
-       spin_lock_init(&aled->lock);
-       mutex_init(&aled->mutex);
-       INIT_WORK(&aled->led_work, ar8327_led_work_func);
-
-       ret = ar8327_led_register(priv, aled);
-       if (ret)
-               goto err_free;
-
-       data->leds[data->num_leds++] = aled;
-
-       return 0;
-
-err_free:
-       kfree(aled);
-       return ret;
-}
-
-static void
-ar8327_led_destroy(struct ar8327_led *aled)
-{
-       ar8327_led_unregister(aled);
-       kfree(aled);
-}
-
-static void
-ar8327_leds_init(struct ar8xxx_priv *priv)
-{
-       struct ar8327_data *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;
-
-               aled = data->leds[i];
-
-               if (aled->enable_hw_mode)
-                       aled->pattern = AR8327_LED_PATTERN_RULE;
-               else
-                       aled->pattern = AR8327_LED_PATTERN_OFF;
-
-               ar8327_set_led_pattern(priv, aled->led_num, aled->pattern);
-       }
-}
-
-static void
-ar8327_leds_cleanup(struct ar8xxx_priv *priv)
-{
-       struct ar8327_data *data = &priv->chip_data.ar8327;
-       unsigned i;
-
-       if (!IS_ENABLED(CONFIG_AR8216_PHY_LEDS))
-               return;
-
-       for (i = 0; i < data->num_leds; i++) {
-               struct ar8327_led *aled;
-
-               aled = data->leds[i];
-               ar8327_led_destroy(aled);
-       }
-
-       kfree(data->leds);
-}
-
-static int
-ar8327_hw_config_pdata(struct ar8xxx_priv *priv,
-                      struct ar8327_platform_data *pdata)
-{
-       struct ar8327_led_cfg *led_cfg;
-       struct ar8327_data *data;
-       u32 pos, new_pos;
-       u32 t;
-
-       if (!pdata)
-               return -EINVAL;
-
-       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);
-
-       t = ar8327_get_pad_cfg(pdata->pad0_cfg);
-       if (chip_is_ar8337(priv))
-               t |= AR8337_PAD_MAC06_EXCHANGE_EN;
-
-       priv->write(priv, AR8327_REG_PAD0_MODE, t);
-       t = ar8327_get_pad_cfg(pdata->pad5_cfg);
-       priv->write(priv, AR8327_REG_PAD5_MODE, t);
-       t = ar8327_get_pad_cfg(pdata->pad6_cfg);
-       priv->write(priv, AR8327_REG_PAD6_MODE, t);
-
-       pos = priv->read(priv, AR8327_REG_POWER_ON_STRIP);
-       new_pos = pos;
-
-       led_cfg = pdata->led_cfg;
-       if (led_cfg) {
-               if (led_cfg->open_drain)
-                       new_pos |= AR8327_POWER_ON_STRIP_LED_OPEN_EN;
-               else
-                       new_pos &= ~AR8327_POWER_ON_STRIP_LED_OPEN_EN;
-
-               priv->write(priv, AR8327_REG_LED_CTRL0, led_cfg->led_ctrl0);
-               priv->write(priv, AR8327_REG_LED_CTRL1, led_cfg->led_ctrl1);
-               priv->write(priv, AR8327_REG_LED_CTRL2, led_cfg->led_ctrl2);
-               priv->write(priv, AR8327_REG_LED_CTRL3, led_cfg->led_ctrl3);
-
-               if (new_pos != pos)
-                       new_pos |= AR8327_POWER_ON_STRIP_POWER_ON_SEL;
-       }
-
-       if (pdata->sgmii_cfg) {
-               t = pdata->sgmii_cfg->sgmii_ctrl;
-               if (priv->chip_rev == 1)
-                       t |= AR8327_SGMII_CTRL_EN_PLL |
-                            AR8327_SGMII_CTRL_EN_RX |
-                            AR8327_SGMII_CTRL_EN_TX;
-               else
-                       t &= ~(AR8327_SGMII_CTRL_EN_PLL |
-                              AR8327_SGMII_CTRL_EN_RX |
-                              AR8327_SGMII_CTRL_EN_TX);
-
-               priv->write(priv, AR8327_REG_SGMII_CTRL, t);
-
-               if (pdata->sgmii_cfg->serdes_aen)
-                       new_pos &= ~AR8327_POWER_ON_STRIP_SERDES_AEN;
-               else
-                       new_pos |= AR8327_POWER_ON_STRIP_SERDES_AEN;
-       }
-
-       priv->write(priv, AR8327_REG_POWER_ON_STRIP, new_pos);
-
-       if (pdata->leds && pdata->num_leds) {
-               int i;
-
-               data->leds = kzalloc(pdata->num_leds * sizeof(void *),
-                                    GFP_KERNEL);
-               if (!data->leds)
-                       return -ENOMEM;
-
-               for (i = 0; i < pdata->num_leds; i++)
-                       ar8327_led_create(priv, &pdata->leds[i]);
-       }
-
-       return 0;
-}
-
-#ifdef CONFIG_OF
-static int
-ar8327_hw_config_of(struct ar8xxx_priv *priv, struct device_node *np)
-{
-       const __be32 *paddr;
-       int len;
-       int i;
-
-       paddr = of_get_property(np, "qca,ar8327-initvals", &len);
-       if (!paddr || len < (2 * sizeof(*paddr)))
-               return -EINVAL;
-
-       len /= sizeof(*paddr);
-
-       for (i = 0; i < len - 1; i += 2) {
-               u32 reg;
-               u32 val;
-
-               reg = be32_to_cpup(paddr + i);
-               val = be32_to_cpup(paddr + i + 1);
-
-               switch (reg) {
-               case AR8327_REG_PORT_STATUS(0):
-                       priv->chip_data.ar8327.port0_status = val;
-                       break;
-               case AR8327_REG_PORT_STATUS(6):
-                       priv->chip_data.ar8327.port6_status = val;
-                       break;
-               default:
-                       priv->write(priv, reg, val);
-                       break;
-               }
-       }
-
-       return 0;
-}
-#else
-static inline int
-ar8327_hw_config_of(struct ar8xxx_priv *priv, struct device_node *np)
-{
-       return -EINVAL;
-}
-#endif
-
-static int
-ar8327_hw_init(struct ar8xxx_priv *priv)
-{
-       struct mii_bus *bus;
-       int ret;
-       int i;
-
-       if (priv->phy->dev.of_node)
-               ret = ar8327_hw_config_of(priv, priv->phy->dev.of_node);
-       else
-               ret = ar8327_hw_config_pdata(priv,
-                                            priv->phy->dev.platform_data);
-
-       if (ret)
-               return ret;
-
-       ar8327_leds_init(priv);
-
-       bus = priv->mii_bus;
-       for (i = 0; i < AR8XXX_NUM_PHYS; i++) {
-               ar8327_phy_fixup(priv, i);
-
-               /* start aneg on the PHY */
-               mdiobus_write(bus, i, MII_ADVERTISE, ADVERTISE_ALL |
-                                                    ADVERTISE_PAUSE_CAP |
-                                                    ADVERTISE_PAUSE_ASYM);
-               mdiobus_write(bus, i, MII_CTRL1000, ADVERTISE_1000FULL);
-               mdiobus_write(bus, i, MII_BMCR, BMCR_RESET | BMCR_ANENABLE);
-       }
-
-       msleep(1000);
-
-       return 0;
-}
-
-static void
-ar8327_cleanup(struct ar8xxx_priv *priv)
-{
-       ar8327_leds_cleanup(priv);
-}
-
-static void
-ar8327_init_globals(struct ar8xxx_priv *priv)
-{
-       u32 t;
-
-       /* enable CPU port and disable mirror port */
-       t = AR8327_FWD_CTRL0_CPU_PORT_EN |
-           AR8327_FWD_CTRL0_MIRROR_PORT;
-       priv->write(priv, AR8327_REG_FWD_CTRL0, t);
-
-       /* forward multicast and broadcast frames to CPU */
-       t = (AR8327_PORTS_ALL << AR8327_FWD_CTRL1_UC_FLOOD_S) |
-           (AR8327_PORTS_ALL << AR8327_FWD_CTRL1_MC_FLOOD_S) |
-           (AR8327_PORTS_ALL << AR8327_FWD_CTRL1_BC_FLOOD_S);
-       priv->write(priv, AR8327_REG_FWD_CTRL1, t);
-
-       /* enable jumbo frames */
-       ar8xxx_rmw(priv, AR8327_REG_MAX_FRAME_SIZE,
-                  AR8327_MAX_FRAME_SIZE_MTU, 9018 + 8 + 2);
-
-       /* Enable MIB counters */
-       ar8xxx_reg_set(priv, AR8327_REG_MODULE_EN,
-                      AR8327_MODULE_EN_MIB);
-
-       /* Disable EEE on all ports due to stability issues */
-       t = priv->read(priv, AR8327_REG_EEE_CTRL);
-       t |= AR8327_EEE_CTRL_DISABLE_PHY(0) |
-            AR8327_EEE_CTRL_DISABLE_PHY(1) |
-            AR8327_EEE_CTRL_DISABLE_PHY(2) |
-            AR8327_EEE_CTRL_DISABLE_PHY(3) |
-            AR8327_EEE_CTRL_DISABLE_PHY(4);
-       priv->write(priv, AR8327_REG_EEE_CTRL, t);
-}
-
-static void
-ar8327_init_port(struct ar8xxx_priv *priv, int port)
-{
-       u32 t;
-
-       if (port == AR8216_PORT_CPU)
-               t = priv->chip_data.ar8327.port0_status;
-       else if (port == 6)
-               t = priv->chip_data.ar8327.port6_status;
-       else
-               t = AR8216_PORT_STATUS_LINK_AUTO;
-
-       priv->write(priv, AR8327_REG_PORT_STATUS(port), t);
-       priv->write(priv, AR8327_REG_PORT_HEADER(port), 0);
-
-       t = 1 << AR8327_PORT_VLAN0_DEF_SVID_S;
-       t |= 1 << AR8327_PORT_VLAN0_DEF_CVID_S;
-       priv->write(priv, AR8327_REG_PORT_VLAN0(port), t);
-
-       t = AR8327_PORT_VLAN1_OUT_MODE_UNTOUCH << AR8327_PORT_VLAN1_OUT_MODE_S;
-       priv->write(priv, AR8327_REG_PORT_VLAN1(port), t);
-
-       t = AR8327_PORT_LOOKUP_LEARN;
-       t |= AR8216_PORT_STATE_FORWARD << AR8327_PORT_LOOKUP_STATE_S;
-       priv->write(priv, AR8327_REG_PORT_LOOKUP(port), t);
-}
-
-static u32
-ar8327_read_port_status(struct ar8xxx_priv *priv, int port)
-{
-       return priv->read(priv, AR8327_REG_PORT_STATUS(port));
-}
-
-static int
-ar8327_atu_flush(struct ar8xxx_priv *priv)
-{
-       int ret;
-
-       ret = ar8216_wait_bit(priv, AR8327_REG_ATU_FUNC,
-                             AR8327_ATU_FUNC_BUSY, 0);
-       if (!ret)
-               priv->write(priv, AR8327_REG_ATU_FUNC,
-                           AR8327_ATU_FUNC_OP_FLUSH);
-
-       return ret;
-}
-
-static void
-ar8327_vtu_op(struct ar8xxx_priv *priv, u32 op, u32 val)
-{
-       if (ar8216_wait_bit(priv, AR8327_REG_VTU_FUNC1,
-                           AR8327_VTU_FUNC1_BUSY, 0))
-               return;
-
-       if ((op & AR8327_VTU_FUNC1_OP) == AR8327_VTU_FUNC1_OP_LOAD)
-               priv->write(priv, AR8327_REG_VTU_FUNC0, val);
-
-       op |= AR8327_VTU_FUNC1_BUSY;
-       priv->write(priv, AR8327_REG_VTU_FUNC1, op);
-}
-
-static void
-ar8327_vtu_flush(struct ar8xxx_priv *priv)
-{
-       ar8327_vtu_op(priv, AR8327_VTU_FUNC1_OP_FLUSH, 0);
-}
-
-static void
-ar8327_vtu_load_vlan(struct ar8xxx_priv *priv, u32 vid, u32 port_mask)
-{
-       u32 op;
-       u32 val;
-       int i;
-
-       op = AR8327_VTU_FUNC1_OP_LOAD | (vid << AR8327_VTU_FUNC1_VID_S);
-       val = AR8327_VTU_FUNC0_VALID | AR8327_VTU_FUNC0_IVL;
-       for (i = 0; i < AR8327_NUM_PORTS; i++) {
-               u32 mode;
-
-               if ((port_mask & BIT(i)) == 0)
-                       mode = AR8327_VTU_FUNC0_EG_MODE_NOT;
-               else if (priv->vlan == 0)
-                       mode = AR8327_VTU_FUNC0_EG_MODE_KEEP;
-               else if ((priv->vlan_tagged & BIT(i)) || (priv->vlan_id[priv->pvid[i]] != vid))
-                       mode = AR8327_VTU_FUNC0_EG_MODE_TAG;
-               else
-                       mode = AR8327_VTU_FUNC0_EG_MODE_UNTAG;
-
-               val |= mode << AR8327_VTU_FUNC0_EG_MODE_S(i);
-       }
-       ar8327_vtu_op(priv, op, val);
-}
-
-static void
-ar8327_setup_port(struct ar8xxx_priv *priv, int port, u32 members)
-{
-       u32 t;
-       u32 egress, ingress;
-       u32 pvid = priv->vlan_id[priv->pvid[port]];
-
-       if (priv->vlan) {
-               egress = AR8327_PORT_VLAN1_OUT_MODE_UNMOD;
-               ingress = AR8216_IN_SECURE;
-       } else {
-               egress = AR8327_PORT_VLAN1_OUT_MODE_UNTOUCH;
-               ingress = AR8216_IN_PORT_ONLY;
-       }
-
-       t = pvid << AR8327_PORT_VLAN0_DEF_SVID_S;
-       t |= pvid << AR8327_PORT_VLAN0_DEF_CVID_S;
-       priv->write(priv, AR8327_REG_PORT_VLAN0(port), t);
-
-       t = AR8327_PORT_VLAN1_PORT_VLAN_PROP;
-       t |= egress << AR8327_PORT_VLAN1_OUT_MODE_S;
-       priv->write(priv, AR8327_REG_PORT_VLAN1(port), t);
-
-       t = members;
-       t |= AR8327_PORT_LOOKUP_LEARN;
-       t |= ingress << AR8327_PORT_LOOKUP_IN_MODE_S;
-       t |= AR8216_PORT_STATE_FORWARD << AR8327_PORT_LOOKUP_STATE_S;
-       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,
-
-       .num_mibs = ARRAY_SIZE(ar8236_mibs),
-       .mib_decs = ar8236_mibs,
-};
-
-static int
+int
 ar8xxx_sw_set_vlan(struct switch_dev *dev, const struct switch_attr *attr,
                   struct switch_val *val)
 {
@@ -1815,7 +1030,7 @@ ar8xxx_sw_set_vlan(struct switch_dev *dev, const struct switch_attr *attr,
        return 0;
 }
 
-static int
+int
 ar8xxx_sw_get_vlan(struct switch_dev *dev, const struct switch_attr *attr,
                   struct switch_val *val)
 {
@@ -1825,24 +1040,29 @@ ar8xxx_sw_get_vlan(struct switch_dev *dev, const struct switch_attr *attr,
 }
 
 
-static int
+int
 ar8xxx_sw_set_pvid(struct switch_dev *dev, int port, int vlan)
 {
        struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
 
        /* make sure no invalid PVIDs get set */
 
-       if (vlan >= dev->vlans)
+       if (vlan < 0 || vlan >= dev->vlans ||
+           port < 0 || port >= AR8X16_MAX_PORTS)
                return -EINVAL;
 
        priv->pvid[port] = vlan;
        return 0;
 }
 
-static int
+int
 ar8xxx_sw_get_pvid(struct switch_dev *dev, int port, int *vlan)
 {
        struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+
+       if (port < 0 || port >= AR8X16_MAX_PORTS)
+               return -EINVAL;
+
        *vlan = priv->pvid[port];
        return 0;
 }
@@ -1852,6 +1072,10 @@ ar8xxx_sw_set_vid(struct switch_dev *dev, const struct switch_attr *attr,
                  struct switch_val *val)
 {
        struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+
+       if (val->port_vlan >= AR8X16_MAX_VLANS)
+               return -EINVAL;
+
        priv->vlan_id[val->port_vlan] = val->value.i;
        return 0;
 }
@@ -1865,7 +1089,7 @@ ar8xxx_sw_get_vid(struct switch_dev *dev, const struct switch_attr *attr,
        return 0;
 }
 
-static int
+int
 ar8xxx_sw_get_port_link(struct switch_dev *dev, int port,
                        struct switch_port_link *link)
 {
@@ -1879,33 +1103,13 @@ static int
 ar8xxx_sw_get_ports(struct switch_dev *dev, struct switch_val *val)
 {
        struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
-       u8 ports = priv->vlan_table[val->port_vlan];
+       u8 ports;
        int i;
 
-       val->len = 0;
-       for (i = 0; i < dev->ports; i++) {
-               struct switch_port *p;
-
-               if (!(ports & (1 << i)))
-                       continue;
-
-               p = &val->value.ports[val->len++];
-               p->id = i;
-               if (priv->vlan_tagged & (1 << i))
-                       p->flags = (1 << SWITCH_PORT_FLAG_TAGGED);
-               else
-                       p->flags = 0;
-       }
-       return 0;
-}
-
-static int
-ar8327_sw_get_ports(struct switch_dev *dev, struct switch_val *val)
-{
-       struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
-       u8 ports = priv->vlan_table[val->port_vlan];
-       int i;
+       if (val->port_vlan >= AR8X16_MAX_VLANS)
+               return -EINVAL;
 
+       ports = priv->vlan_table[val->port_vlan];
        val->len = 0;
        for (i = 0; i < dev->ports; i++) {
                struct switch_port *p;
@@ -1915,7 +1119,7 @@ ar8327_sw_get_ports(struct switch_dev *dev, struct switch_val *val)
 
                p = &val->value.ports[val->len++];
                p->id = i;
-               if ((priv->vlan_tagged & (1 << i)) || (priv->pvid[i] != val->port_vlan))
+               if (priv->vlan_tagged & (1 << i))
                        p->flags = (1 << SWITCH_PORT_FLAG_TAGGED);
                else
                        p->flags = 0;
@@ -1954,72 +1158,6 @@ ar8xxx_sw_set_ports(struct switch_dev *dev, struct switch_val *val)
        return 0;
 }
 
-static int
-ar8327_sw_set_ports(struct switch_dev *dev, struct switch_val *val)
-{
-       struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
-       u8 *vt = &priv->vlan_table[val->port_vlan];
-       int i;
-
-       *vt = 0;
-       for (i = 0; i < val->len; i++) {
-               struct switch_port *p = &val->value.ports[i];
-
-               if (p->flags & (1 << SWITCH_PORT_FLAG_TAGGED)) {
-                       if (val->port_vlan == priv->pvid[p->id]) {
-                               priv->vlan_tagged |= (1 << p->id);
-                       }
-               } else {
-                       priv->vlan_tagged &= ~(1 << p->id);
-                       priv->pvid[p->id] = val->port_vlan;
-               }
-
-               *vt |= 1 << p->id;
-       }
-       return 0;
-}
-
-static void
-ar8327_set_mirror_regs(struct ar8xxx_priv *priv)
-{
-       int port;
-
-       /* reset all mirror registers */
-       ar8xxx_rmw(priv, AR8327_REG_FWD_CTRL0,
-                  AR8327_FWD_CTRL0_MIRROR_PORT,
-                  (0xF << AR8327_FWD_CTRL0_MIRROR_PORT_S));
-       for (port = 0; port < AR8327_NUM_PORTS; port++) {
-               ar8xxx_rmw(priv, AR8327_REG_PORT_LOOKUP(port),
-                          AR8327_PORT_LOOKUP_ING_MIRROR_EN,
-                          0);
-
-               ar8xxx_rmw(priv, AR8327_REG_PORT_HOL_CTRL1(port),
-                          AR8327_PORT_HOL_CTRL1_EG_MIRROR_EN,
-                          0);
-       }
-
-       /* now enable mirroring if necessary */
-       if (priv->source_port >= AR8327_NUM_PORTS ||
-           priv->monitor_port >= AR8327_NUM_PORTS ||
-           priv->source_port == priv->monitor_port) {
-               return;
-       }
-
-       ar8xxx_rmw(priv, AR8327_REG_FWD_CTRL0,
-                  AR8327_FWD_CTRL0_MIRROR_PORT,
-                  (priv->monitor_port << AR8327_FWD_CTRL0_MIRROR_PORT_S));
-
-       if (priv->mirror_rx)
-               ar8xxx_rmw(priv, AR8327_REG_PORT_LOOKUP(priv->source_port),
-                          AR8327_PORT_LOOKUP_ING_MIRROR_EN,
-                          AR8327_PORT_LOOKUP_ING_MIRROR_EN);
-
-       if (priv->mirror_tx)
-               ar8xxx_rmw(priv, AR8327_REG_PORT_HOL_CTRL1(priv->source_port),
-                          AR8327_PORT_HOL_CTRL1_EG_MIRROR_EN,
-                          AR8327_PORT_HOL_CTRL1_EG_MIRROR_EN);
-}
-
 static void
 ar8216_set_mirror_regs(struct ar8xxx_priv *priv)
 {
@@ -2030,13 +1168,11 @@ ar8216_set_mirror_regs(struct ar8xxx_priv *priv)
                   AR8216_GLOBAL_CPUPORT_MIRROR_PORT,
                   (0xF << AR8216_GLOBAL_CPUPORT_MIRROR_PORT_S));
        for (port = 0; port < AR8216_NUM_PORTS; port++) {
-               ar8xxx_rmw(priv, AR8216_REG_PORT_CTRL(port),
-                          AR8216_PORT_CTRL_MIRROR_RX,
-                          0);
+               ar8xxx_reg_clear(priv, AR8216_REG_PORT_CTRL(port),
+                          AR8216_PORT_CTRL_MIRROR_RX);
 
-               ar8xxx_rmw(priv, AR8216_REG_PORT_CTRL(port),
-                          AR8216_PORT_CTRL_MIRROR_TX,
-                          0);
+               ar8xxx_reg_clear(priv, AR8216_REG_PORT_CTRL(port),
+                          AR8216_PORT_CTRL_MIRROR_TX);
        }
 
        /* now enable mirroring if necessary */
@@ -2051,30 +1187,33 @@ ar8216_set_mirror_regs(struct ar8xxx_priv *priv)
                   (priv->monitor_port << AR8216_GLOBAL_CPUPORT_MIRROR_PORT_S));
 
        if (priv->mirror_rx)
-               ar8xxx_rmw(priv, AR8216_REG_PORT_CTRL(priv->source_port),
-                          AR8216_PORT_CTRL_MIRROR_RX,
+               ar8xxx_reg_set(priv, AR8216_REG_PORT_CTRL(priv->source_port),
                           AR8216_PORT_CTRL_MIRROR_RX);
 
        if (priv->mirror_tx)
-               ar8xxx_rmw(priv, AR8216_REG_PORT_CTRL(priv->source_port),
-                          AR8216_PORT_CTRL_MIRROR_TX,
+               ar8xxx_reg_set(priv, AR8216_REG_PORT_CTRL(priv->source_port),
                           AR8216_PORT_CTRL_MIRROR_TX);
 }
 
-static void
-ar8xxx_set_mirror_regs(struct ar8xxx_priv *priv)
+static inline u32
+ar8xxx_age_time_val(int age_time)
 {
-       if (chip_is_ar8327(priv) || chip_is_ar8337(priv)) {
-               ar8327_set_mirror_regs(priv);
-       } else {
-               ar8216_set_mirror_regs(priv);
-       }
+       return (age_time + AR8XXX_REG_ARL_CTRL_AGE_TIME_SECS / 2) /
+              AR8XXX_REG_ARL_CTRL_AGE_TIME_SECS;
 }
 
-static int
+static inline void
+ar8xxx_set_age_time(struct ar8xxx_priv *priv, int reg)
+{
+       u32 age_time = ar8xxx_age_time_val(priv->arl_age_time);
+       ar8xxx_rmw(priv, reg, AR8216_ATU_CTRL_AGE_TIME, age_time << AR8216_ATU_CTRL_AGE_TIME_S);
+}
+
+int
 ar8xxx_sw_hw_apply(struct switch_dev *dev)
 {
        struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+       const struct ar8xxx_chip *chip = priv->chip;
        u8 portmask[AR8X16_MAX_PORTS];
        int i, j;
 
@@ -2098,8 +1237,8 @@ ar8xxx_sw_hw_apply(struct switch_dev *dev)
                                        portmask[i] |= vp & ~mask;
                        }
 
-                       priv->chip->vtu_load_vlan(priv, priv->vlan_id[j],
-                                                priv->vlan_table[j]);
+                       chip->vtu_load_vlan(priv, priv->vlan_id[j],
+                                           priv->vlan_table[j]);
                }
        } else {
                /* vlan disabled:
@@ -2115,19 +1254,24 @@ ar8xxx_sw_hw_apply(struct switch_dev *dev)
 
        /* update the port destination mask registers and tag settings */
        for (i = 0; i < dev->ports; i++) {
-               priv->chip->setup_port(priv, i, portmask[i]);
+               chip->setup_port(priv, i, portmask[i]);
        }
 
-       ar8xxx_set_mirror_regs(priv);
+       chip->set_mirror_regs(priv);
+
+       /* set age time */
+       if (chip->reg_arl_ctrl)
+               ar8xxx_set_age_time(priv, chip->reg_arl_ctrl);
 
        mutex_unlock(&priv->reg_mutex);
        return 0;
 }
 
-static int
+int
 ar8xxx_sw_reset_switch(struct switch_dev *dev)
 {
        struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+       const struct ar8xxx_chip *chip = priv->chip;
        int i;
 
        mutex_lock(&priv->reg_mutex);
@@ -2139,21 +1283,23 @@ ar8xxx_sw_reset_switch(struct switch_dev *dev)
 
        /* Configure all ports */
        for (i = 0; i < dev->ports; i++)
-               priv->chip->init_port(priv, i);
+               chip->init_port(priv, i);
 
        priv->mirror_rx = false;
        priv->mirror_tx = false;
        priv->source_port = 0;
        priv->monitor_port = 0;
+       priv->arl_age_time = AR8XXX_DEFAULT_ARL_AGE_TIME;
 
-       priv->chip->init_globals(priv);
+       chip->init_globals(priv);
+       chip->atu_flush(priv);
 
        mutex_unlock(&priv->reg_mutex);
 
-       return ar8xxx_sw_hw_apply(dev);
+       return chip->sw_hw_apply(dev);
 }
 
-static int
+int
 ar8xxx_sw_set_reset_mibs(struct switch_dev *dev,
                         const struct switch_attr *attr,
                         struct switch_val *val)
@@ -2181,7 +1327,7 @@ unlock:
        return ret;
 }
 
-static int
+int
 ar8xxx_sw_set_mirror_rx_enable(struct switch_dev *dev,
                               const struct switch_attr *attr,
                               struct switch_val *val)
@@ -2190,13 +1336,13 @@ 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;
 }
 
-static int
+int
 ar8xxx_sw_get_mirror_rx_enable(struct switch_dev *dev,
                               const struct switch_attr *attr,
                               struct switch_val *val)
@@ -2206,7 +1352,7 @@ ar8xxx_sw_get_mirror_rx_enable(struct switch_dev *dev,
        return 0;
 }
 
-static int
+int
 ar8xxx_sw_set_mirror_tx_enable(struct switch_dev *dev,
                               const struct switch_attr *attr,
                               struct switch_val *val)
@@ -2215,13 +1361,13 @@ 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;
 }
 
-static int
+int
 ar8xxx_sw_get_mirror_tx_enable(struct switch_dev *dev,
                               const struct switch_attr *attr,
                               struct switch_val *val)
@@ -2231,7 +1377,7 @@ ar8xxx_sw_get_mirror_tx_enable(struct switch_dev *dev,
        return 0;
 }
 
-static int
+int
 ar8xxx_sw_set_mirror_monitor_port(struct switch_dev *dev,
                                  const struct switch_attr *attr,
                                  struct switch_val *val)
@@ -2240,13 +1386,13 @@ 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;
 }
 
-static int
+int
 ar8xxx_sw_get_mirror_monitor_port(struct switch_dev *dev,
                                  const struct switch_attr *attr,
                                  struct switch_val *val)
@@ -2256,7 +1402,7 @@ ar8xxx_sw_get_mirror_monitor_port(struct switch_dev *dev,
        return 0;
 }
 
-static int
+int
 ar8xxx_sw_set_mirror_source_port(struct switch_dev *dev,
                                 const struct switch_attr *attr,
                                 struct switch_val *val)
@@ -2265,13 +1411,13 @@ 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;
 }
 
-static int
+int
 ar8xxx_sw_get_mirror_source_port(struct switch_dev *dev,
                                 const struct switch_attr *attr,
                                 struct switch_val *val)
@@ -2281,7 +1427,7 @@ ar8xxx_sw_get_mirror_source_port(struct switch_dev *dev,
        return 0;
 }
 
-static int
+int
 ar8xxx_sw_set_port_reset_mib(struct switch_dev *dev,
                             const struct switch_attr *attr,
                             struct switch_val *val)
@@ -2311,18 +1457,46 @@ unlock:
        return ret;
 }
 
-static int
+static void
+ar8xxx_byte_to_str(char *buf, int len, u64 byte)
+{
+       unsigned long b;
+       const char *unit;
+
+       if (byte >= 0x40000000) { /* 1 GiB */
+               b = byte * 10 / 0x40000000;
+               unit = "GiB";
+       } else if (byte >= 0x100000) { /* 1 MiB */
+               b = byte * 10 / 0x100000;
+               unit = "MiB";
+       } else if (byte >= 0x400) { /* 1 KiB */
+               b = byte * 10 / 0x400;
+               unit = "KiB";
+       } else {
+               b = byte;
+               unit = "Byte";
+       }
+       if (strcmp(unit, "Byte"))
+               snprintf(buf, len, "%lu.%lu %s", b / 10, b % 10, unit);
+       else
+               snprintf(buf, len, "%lu %s", b, unit);
+}
+
+int
 ar8xxx_sw_get_port_mib(struct switch_dev *dev,
                       const struct switch_attr *attr,
                       struct switch_val *val)
 {
        struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
        const struct ar8xxx_chip *chip = priv->chip;
-       u64 *mib_stats;
-       int port;
+       u64 *mib_stats, mib_data;
+       unsigned int port;
        int ret;
        char *buf = priv->buf;
+       char buf1[64];
+       const char *mib_name;
        int i, len = 0;
+       bool mib_stats_empty = true;
 
        if (!ar8xxx_has_mib_counters(priv))
                return -EOPNOTSUPP;
@@ -2339,15 +1513,28 @@ ar8xxx_sw_get_port_mib(struct switch_dev *dev,
        ar8xxx_mib_fetch_port_stat(priv, port, false);
 
        len += snprintf(buf + len, sizeof(priv->buf) - len,
-                       "Port %d MIB counters\n",
-                       port);
+                       "MIB counters\n");
 
        mib_stats = &priv->mib_stats[port * chip->num_mibs];
-       for (i = 0; i < chip->num_mibs; i++)
+       for (i = 0; i < chip->num_mibs; i++) {
+               mib_name = chip->mib_decs[i].name;
+               mib_data = mib_stats[i];
                len += snprintf(buf + len, sizeof(priv->buf) - len,
-                               "%-12s: %llu\n",
-                               chip->mib_decs[i].name,
-                               mib_stats[i]);
+                               "%-12s: %llu\n", mib_name, mib_data);
+               if ((!strcmp(mib_name, "TxByte") ||
+                   !strcmp(mib_name, "RxGoodByte")) &&
+                   mib_data >= 1024) {
+                       ar8xxx_byte_to_str(buf1, sizeof(buf1), mib_data);
+                       --len; /* discard newline at the end of buf */
+                       len += snprintf(buf + len, sizeof(priv->buf) - len,
+                                       " (%s)\n", buf1);
+               }
+               if (mib_stats_empty && mib_data)
+                       mib_stats_empty = false;
+       }
+
+       if (mib_stats_empty)
+               len = snprintf(buf, sizeof(priv->buf), "No MIB data");
 
        val->value.s = buf;
        val->len = len;
@@ -2359,56 +1546,159 @@ unlock:
        return ret;
 }
 
-static struct switch_attr ar8xxx_sw_attr_globals[] = {
-       {
-               .type = SWITCH_TYPE_INT,
-               .name = "enable_vlan",
-               .description = "Enable VLAN mode",
-               .set = ar8xxx_sw_set_vlan,
-               .get = ar8xxx_sw_get_vlan,
-               .max = 1
-       },
-       {
-               .type = SWITCH_TYPE_NOVAL,
-               .name = "reset_mibs",
-               .description = "Reset all MIB counters",
-               .set = ar8xxx_sw_set_reset_mibs,
-       },
-       {
-               .type = SWITCH_TYPE_INT,
-               .name = "enable_mirror_rx",
-               .description = "Enable mirroring of RX packets",
-               .set = ar8xxx_sw_set_mirror_rx_enable,
-               .get = ar8xxx_sw_get_mirror_rx_enable,
-               .max = 1
-       },
-       {
-               .type = SWITCH_TYPE_INT,
-               .name = "enable_mirror_tx",
-               .description = "Enable mirroring of TX packets",
-               .set = ar8xxx_sw_set_mirror_tx_enable,
-               .get = ar8xxx_sw_get_mirror_tx_enable,
-               .max = 1
-       },
-       {
-               .type = SWITCH_TYPE_INT,
-               .name = "mirror_monitor_port",
-               .description = "Mirror monitor port",
-               .set = ar8xxx_sw_set_mirror_monitor_port,
-               .get = ar8xxx_sw_get_mirror_monitor_port,
-               .max = AR8216_NUM_PORTS - 1
-       },
-       {
-               .type = SWITCH_TYPE_INT,
-               .name = "mirror_source_port",
-               .description = "Mirror source port",
-               .set = ar8xxx_sw_set_mirror_source_port,
-               .get = ar8xxx_sw_get_mirror_source_port,
-               .max = AR8216_NUM_PORTS - 1
-       },
-};
+int
+ar8xxx_sw_set_arl_age_time(struct switch_dev *dev, const struct switch_attr *attr,
+                          struct switch_val *val)
+{
+       struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+       int age_time = val->value.i;
+       u32 age_time_val;
+
+       if (age_time < 0)
+               return -EINVAL;
+
+       age_time_val = ar8xxx_age_time_val(age_time);
+       if (age_time_val == 0 || age_time_val > 0xffff)
+               return -EINVAL;
+
+       priv->arl_age_time = age_time;
+       return 0;
+}
+
+int
+ar8xxx_sw_get_arl_age_time(struct switch_dev *dev, const struct switch_attr *attr,
+                   struct switch_val *val)
+{
+       struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+       val->value.i = priv->arl_age_time;
+       return 0;
+}
+
+int
+ar8xxx_sw_get_arl_table(struct switch_dev *dev,
+                       const struct switch_attr *attr,
+                       struct switch_val *val)
+{
+       struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+       struct mii_bus *bus = priv->mii_bus;
+       const struct ar8xxx_chip *chip = priv->chip;
+       char *buf = priv->arl_buf;
+       int i, j, k, len = 0;
+       struct arl_entry *a, *a1;
+       u32 status;
+
+       if (!chip->get_arl_entry)
+               return -EOPNOTSUPP;
+
+       mutex_lock(&priv->reg_mutex);
+       mutex_lock(&bus->mdio_lock);
+
+       chip->get_arl_entry(priv, NULL, NULL, AR8XXX_ARL_INITIALIZE);
+
+       for(i = 0; i < AR8XXX_NUM_ARL_RECORDS; ++i) {
+               a = &priv->arl_table[i];
+               duplicate:
+               chip->get_arl_entry(priv, a, &status, AR8XXX_ARL_GET_NEXT);
+
+               if (!status)
+                       break;
+
+               /* avoid duplicates
+                * ARL table can include multiple valid entries
+                * per MAC, just with differing status codes
+                */
+               for (j = 0; j < i; ++j) {
+                       a1 = &priv->arl_table[j];
+                       if (!memcmp(a->mac, a1->mac, sizeof(a->mac))) {
+                               /* ignore ports already seen in former entry */
+                               a->portmap &= ~a1->portmap;
+                               if (!a->portmap)
+                                       goto duplicate;
+                       }
+               }
+       }
+
+       mutex_unlock(&bus->mdio_lock);
+
+       len += snprintf(buf + len, sizeof(priv->arl_buf) - len,
+                        "address resolution table\n");
+
+       if (i == AR8XXX_NUM_ARL_RECORDS)
+               len += snprintf(buf + len, sizeof(priv->arl_buf) - len,
+                               "Too many entries found, displaying the first %d only!\n",
+                               AR8XXX_NUM_ARL_RECORDS);
+
+       for (j = 0; j < priv->dev.ports; ++j) {
+               for (k = 0; k < i; ++k) {
+                       a = &priv->arl_table[k];
+                       if (!(a->portmap & BIT(j)))
+                               continue;
+                       len += snprintf(buf + len, sizeof(priv->arl_buf) - len,
+                                       "Port %d: MAC %02x:%02x:%02x:%02x:%02x:%02x\n",
+                                       j,
+                                       a->mac[5], a->mac[4], a->mac[3],
+                                       a->mac[2], a->mac[1], a->mac[0]);
+               }
+       }
+
+       val->value.s = buf;
+       val->len = len;
+
+       mutex_unlock(&priv->reg_mutex);
+
+       return 0;
+}
+
+int
+ar8xxx_sw_set_flush_arl_table(struct switch_dev *dev,
+                             const struct switch_attr *attr,
+                             struct switch_val *val)
+{
+       struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+       int ret;
+
+       mutex_lock(&priv->reg_mutex);
+       ret = priv->chip->atu_flush(priv);
+       mutex_unlock(&priv->reg_mutex);
+
+       return ret;
+}
+
+int
+ar8xxx_sw_set_flush_port_arl_table(struct switch_dev *dev,
+                                  const struct switch_attr *attr,
+                                  struct switch_val *val)
+{
+       struct ar8xxx_priv *priv = swdev_to_ar8xxx(dev);
+       int port, ret;
+
+       port = val->port_vlan;
+       if (port >= dev->ports)
+               return -EINVAL;
+
+       mutex_lock(&priv->reg_mutex);
+       ret = priv->chip->atu_flush_port(priv, port);
+       mutex_unlock(&priv->reg_mutex);
+
+       return ret;
+}
+
+static int
+ar8xxx_phy_read(struct mii_bus *bus, int phy_addr, int reg_addr)
+{
+       struct ar8xxx_priv *priv = bus->priv;
+       return priv->chip->phy_read(priv, phy_addr, reg_addr);
+}
+
+static int
+ar8xxx_phy_write(struct mii_bus *bus, int phy_addr, int reg_addr,
+                u16 reg_val)
+{
+       struct ar8xxx_priv *priv = bus->priv;
+       return priv->chip->phy_write(priv, phy_addr, reg_addr, reg_val);
+}
 
-static struct switch_attr ar8327_sw_attr_globals[] = {
+static const struct switch_attr ar8xxx_sw_attr_globals[] = {
        {
                .type = SWITCH_TYPE_INT,
                .name = "enable_vlan",
@@ -2445,7 +1735,7 @@ static struct switch_attr ar8327_sw_attr_globals[] = {
                .description = "Mirror monitor port",
                .set = ar8xxx_sw_set_mirror_monitor_port,
                .get = ar8xxx_sw_get_mirror_monitor_port,
-               .max = AR8327_NUM_PORTS - 1
+               .max = AR8216_NUM_PORTS - 1
        },
        {
                .type = SWITCH_TYPE_INT,
@@ -2453,11 +1743,24 @@ static struct switch_attr ar8327_sw_attr_globals[] = {
                .description = "Mirror source port",
                .set = ar8xxx_sw_set_mirror_source_port,
                .get = ar8xxx_sw_get_mirror_source_port,
-               .max = AR8327_NUM_PORTS - 1
+               .max = AR8216_NUM_PORTS - 1
        },
+       {
+               .type = SWITCH_TYPE_STRING,
+               .name = "arl_table",
+               .description = "Get ARL table",
+               .set = NULL,
+               .get = ar8xxx_sw_get_arl_table,
+       },
+       {
+               .type = SWITCH_TYPE_NOVAL,
+               .name = "flush_arl_table",
+               .description = "Flush ARL table",
+               .set = ar8xxx_sw_set_flush_arl_table,
+       },
 };
 
-static struct switch_attr ar8xxx_sw_attr_port[] = {
+const struct switch_attr ar8xxx_sw_attr_port[] = {
        {
                .type = SWITCH_TYPE_NOVAL,
                .name = "reset_mib",
@@ -2471,9 +1774,15 @@ static struct switch_attr ar8xxx_sw_attr_port[] = {
                .set = NULL,
                .get = ar8xxx_sw_get_port_mib,
        },
+       {
+               .type = SWITCH_TYPE_NOVAL,
+               .name = "flush_arl_table",
+               .description = "Flush port's ARL table entries",
+               .set = ar8xxx_sw_set_flush_port_arl_table,
+       },
 };
 
-static struct switch_attr ar8xxx_sw_attr_vlan[] = {
+const struct switch_attr ar8xxx_sw_attr_vlan[1] = {
        {
                .type = SWITCH_TYPE_INT,
                .name = "vid",
@@ -2504,38 +1813,146 @@ static const struct switch_dev_ops ar8xxx_sw_ops = {
        .apply_config = ar8xxx_sw_hw_apply,
        .reset_switch = ar8xxx_sw_reset_switch,
        .get_port_link = ar8xxx_sw_get_port_link,
+/* The following op is disabled as it hogs the CPU and degrades performance.
+   An implementation has been attempted in 4d8a66d but reading MIB data is slow
+   on ar8xxx switches.
+
+   The high CPU load has been traced down to the ar8xxx_reg_wait() call in
+   ar8xxx_mib_op(), which has to usleep_range() till the MIB busy flag set by
+   the request to update the MIB counter is cleared. */
+#if 0
+       .get_port_stats = ar8xxx_sw_get_port_stats,
+#endif
 };
 
-static const struct switch_dev_ops ar8327_sw_ops = {
-       .attr_global = {
-               .attr = ar8327_sw_attr_globals,
-               .n_attr = ARRAY_SIZE(ar8327_sw_attr_globals),
-       },
-       .attr_port = {
-               .attr = ar8xxx_sw_attr_port,
-               .n_attr = ARRAY_SIZE(ar8xxx_sw_attr_port),
-       },
-       .attr_vlan = {
-               .attr = ar8xxx_sw_attr_vlan,
-               .n_attr = ARRAY_SIZE(ar8xxx_sw_attr_vlan),
-       },
-       .get_port_pvid = ar8xxx_sw_get_pvid,
-       .set_port_pvid = ar8xxx_sw_set_pvid,
-       .get_vlan_ports = ar8327_sw_get_ports,
-       .set_vlan_ports = ar8327_sw_set_ports,
-       .apply_config = ar8xxx_sw_hw_apply,
-       .reset_switch = ar8xxx_sw_reset_switch,
-       .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,
+       .reg_arl_ctrl = AR8216_REG_ATU_CTRL,
+
+       .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,
+       .atu_flush_port = ar8216_atu_flush_port,
+       .vtu_flush = ar8216_vtu_flush,
+       .vtu_load_vlan = ar8216_vtu_load_vlan,
+       .set_mirror_regs = ar8216_set_mirror_regs,
+       .get_arl_entry = ar8216_get_arl_entry,
+       .sw_hw_apply = ar8xxx_sw_hw_apply,
+
+       .num_mibs = ARRAY_SIZE(ar8216_mibs),
+       .mib_decs = ar8216_mibs,
+       .mib_func = AR8216_REG_MIB_FUNC
+};
+
+static const struct ar8xxx_chip ar8229_chip = {
+       .caps = AR8XXX_CAP_MIB_COUNTERS,
+
+       .reg_port_stats_start = 0x20000,
+       .reg_port_stats_length = 0x100,
+       .reg_arl_ctrl = AR8216_REG_ATU_CTRL,
+
+       .name = "Atheros AR8229",
+       .ports = AR8216_NUM_PORTS,
+       .vlans = AR8216_NUM_VLANS,
+       .swops = &ar8xxx_sw_ops,
+
+       .hw_init = ar8229_hw_init,
+       .init_globals = ar8229_init_globals,
+       .init_port = ar8229_init_port,
+       .setup_port = ar8236_setup_port,
+       .read_port_status = ar8216_read_port_status,
+       .atu_flush = ar8216_atu_flush,
+       .atu_flush_port = ar8216_atu_flush_port,
+       .vtu_flush = ar8216_vtu_flush,
+       .vtu_load_vlan = ar8216_vtu_load_vlan,
+       .set_mirror_regs = ar8216_set_mirror_regs,
+       .get_arl_entry = ar8216_get_arl_entry,
+       .sw_hw_apply = ar8xxx_sw_hw_apply,
+
+       .num_mibs = ARRAY_SIZE(ar8236_mibs),
+       .mib_decs = ar8236_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,
+       .reg_arl_ctrl = AR8216_REG_ATU_CTRL,
+
+       .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,
+       .atu_flush_port = ar8216_atu_flush_port,
+       .vtu_flush = ar8216_vtu_flush,
+       .vtu_load_vlan = ar8216_vtu_load_vlan,
+       .set_mirror_regs = ar8216_set_mirror_regs,
+       .get_arl_entry = ar8216_get_arl_entry,
+       .sw_hw_apply = ar8xxx_sw_hw_apply,
+
+       .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,
+       .reg_arl_ctrl = AR8216_REG_ATU_CTRL,
+
+       .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,
+       .atu_flush_port = ar8216_atu_flush_port,
+       .vtu_flush = ar8216_vtu_flush,
+       .vtu_load_vlan = ar8216_vtu_load_vlan,
+       .set_mirror_regs = ar8216_set_mirror_regs,
+       .get_arl_entry = ar8216_get_arl_entry,
+       .sw_hw_apply = ar8xxx_sw_hw_apply,
+
+       .num_mibs = ARRAY_SIZE(ar8236_mibs),
+       .mib_decs = ar8236_mibs,
+       .mib_func = AR8216_REG_MIB_FUNC
 };
 
 static int
-ar8xxx_id_chip(struct ar8xxx_priv *priv)
+ar8xxx_read_id(struct ar8xxx_priv *priv)
 {
        u32 val;
        u16 id;
        int i;
 
-       val = priv->read(priv, AR8216_REG_CTRL);
+       val = ar8xxx_read(priv, AR8216_REG_CTRL);
        if (val == ~0)
                return -ENODEV;
 
@@ -2543,7 +1960,7 @@ ar8xxx_id_chip(struct ar8xxx_priv *priv)
        for (i = 0; i < AR8X16_PROBE_RETRIES; i++) {
                u16 t;
 
-               val = priv->read(priv, AR8216_REG_CTRL);
+               val = ar8xxx_read(priv, AR8216_REG_CTRL);
                if (val == ~0)
                        return -ENODEV;
 
@@ -2554,6 +1971,17 @@ ar8xxx_id_chip(struct ar8xxx_priv *priv)
 
        priv->chip_ver = (id & AR8216_CTRL_VERSION) >> AR8216_CTRL_VERSION_S;
        priv->chip_rev = (id & AR8216_CTRL_REVISION);
+       return 0;
+}
+
+static int
+ar8xxx_id_chip(struct ar8xxx_priv *priv)
+{
+       int ret;
+
+       ret = ar8xxx_read_id(priv);
+       if(ret)
+               return ret;
 
        switch (priv->chip_ver) {
        case AR8XXX_VER_AR8216:
@@ -2566,12 +1994,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",
@@ -2645,7 +2071,7 @@ ar8xxx_mib_stop(struct ar8xxx_priv *priv)
        if (!ar8xxx_has_mib_counters(priv))
                return;
 
-       cancel_delayed_work(&priv->mib_work);
+       cancel_delayed_work_sync(&priv->mib_work);
 }
 
 static struct ar8xxx_priv *
@@ -2670,63 +2096,26 @@ 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);
 }
 
-static struct ar8xxx_priv *
-ar8xxx_create_mii(struct mii_bus *bus)
-{
-       struct ar8xxx_priv *priv;
-
-       priv = ar8xxx_create();
-       if (priv) {
-               priv->mii_bus = bus;
-               priv->read = ar8xxx_mii_read;
-               priv->write = ar8xxx_mii_write;
-               priv->rmw = ar8xxx_mii_rmw;
-       }
-
-       return priv;
-}
-
 static int
 ar8xxx_probe_switch(struct ar8xxx_priv *priv)
 {
+       const struct ar8xxx_chip *chip;
        struct switch_dev *swdev;
        int ret;
 
-       ret = ar8xxx_id_chip(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)
@@ -2767,12 +2156,12 @@ 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;
 
-       if (phydev->addr != 0) {
+       if (phydev->mdio.addr != 0) {
                if (chip_is_ar8316(priv)) {
                        /* switch device has been initialized, reinit */
                        priv->dev.ports = (AR8216_NUM_PORTS - 1);
@@ -2800,17 +2189,49 @@ ar8xxx_phy_config_init(struct phy_device *phydev)
        return 0;
 }
 
+static bool
+ar8xxx_check_link_states(struct ar8xxx_priv *priv)
+{
+       bool link_new, changed = false;
+       u32 status;
+       int i;
+
+       mutex_lock(&priv->reg_mutex);
+
+       for (i = 0; i < priv->dev.ports; i++) {
+               status = priv->chip->read_port_status(priv, i);
+               link_new = !!(status & AR8216_PORT_STATUS_LINK_UP);
+               if (link_new == priv->link_up[i])
+                       continue;
+
+               priv->link_up[i] = link_new;
+               changed = true;
+               /* flush ARL entries for this port if it went down*/
+               if (!link_new)
+                       priv->chip->atu_flush_port(priv, i);
+               dev_info(&priv->phy->mdio.dev, "Port %d is %s\n",
+                        i, link_new ? "up" : "down");
+       }
+
+       mutex_unlock(&priv->reg_mutex);
+
+       return changed;
+}
+
 static int
 ar8xxx_phy_read_status(struct phy_device *phydev)
 {
        struct ar8xxx_priv *priv = phydev->priv;
        struct switch_port_link link;
-       int ret;
 
-       if (phydev->addr != 0)
+       /* check for switch port link changes */
+       if (phydev->state == PHY_CHANGELINK)
+               ar8xxx_check_link_states(priv);
+
+       if (phydev->mdio.addr != 0)
                return genphy_read_status(phydev);
 
-       ar8216_read_port_link(priv, phydev->addr, &link);
+       ar8216_read_port_link(priv, phydev->mdio.addr, &link);
        phydev->link = !!link.link;
        if (!phydev->link)
                return 0;
@@ -2830,22 +2251,18 @@ ar8xxx_phy_read_status(struct phy_device *phydev)
        }
        phydev->duplex = link.duplex ? DUPLEX_FULL : DUPLEX_HALF;
 
-       /* flush the address translation unit */
-       mutex_lock(&priv->reg_mutex);
-       ret = priv->chip->atu_flush(priv);
-       mutex_unlock(&priv->reg_mutex);
-
        phydev->state = PHY_RUNNING;
        netif_carrier_on(phydev->attached_dev);
-       phydev->adjust_link(phydev->attached_dev);
+       if (phydev->adjust_link)
+               phydev->adjust_link(phydev->attached_dev);
 
-       return ret;
+       return 0;
 }
 
 static int
 ar8xxx_phy_config_aneg(struct phy_device *phydev)
 {
-       if (phydev->addr == 0)
+       if (phydev->mdio.addr == 0)
                return 0;
 
        return genphy_config_aneg(phydev);
@@ -2875,21 +2292,21 @@ ar8xxx_phy_match(u32 phy_id)
 static bool
 ar8xxx_is_possible(struct mii_bus *bus)
 {
-       unsigned i;
+       unsigned int i, found_phys = 0;
 
-       for (i = 0; i < 4; i++) {
+       for (i = 0; i < 5; i++) {
                u32 phy_id;
 
                phy_id = mdiobus_read(bus, i, MII_PHYSID1) << 16;
                phy_id |= mdiobus_read(bus, i, MII_PHYSID2);
-               if (!ar8xxx_phy_match(phy_id)) {
+               if (ar8xxx_phy_match(phy_id)) {
+                       found_phys++;
+               } else if (phy_id) {
                        pr_debug("ar8xxx: unknown PHY at %s:%02x id:%08x\n",
                                 dev_name(&bus->dev), i, phy_id);
-                       return false;
                }
        }
-
-       return true;
+       return !!found_phys;
 }
 
 static int
@@ -2900,23 +2317,30 @@ ar8xxx_phy_probe(struct phy_device *phydev)
        int ret;
 
        /* skip PHYs at unused adresses */
-       if (phydev->addr != 0 && phydev->addr != 4)
+       if (phydev->mdio.addr != 0 && phydev->mdio.addr != 3 && phydev->mdio.addr != 4)
                return -ENODEV;
 
-       if (!ar8xxx_is_possible(phydev->bus))
+       if (!ar8xxx_is_possible(phydev->mdio.bus))
                return -ENODEV;
 
        mutex_lock(&ar8xxx_dev_list_lock);
        list_for_each_entry(priv, &ar8xxx_dev_list, list)
-               if (priv->mii_bus == phydev->bus)
+               if (priv->mii_bus == phydev->mdio.bus)
                        goto found;
 
-       priv = ar8xxx_create_mii(phydev->bus);
+       priv = ar8xxx_create();
        if (priv == NULL) {
                ret = -ENOMEM;
                goto unlock;
        }
 
+       priv->mii_bus = phydev->mdio.bus;
+       priv->pdev = &phydev->mdio.dev;
+
+       ret = ar8xxx_id_chip(priv);
+       if (ret)
+               goto free_priv;
+
        ret = ar8xxx_probe_switch(priv);
        if (ret)
                goto free_priv;
@@ -2931,10 +2355,12 @@ ar8xxx_phy_probe(struct phy_device *phydev)
                swdev->devname, swdev->name, priv->chip_rev,
                dev_name(&priv->mii_bus->dev));
 
+       list_add(&priv->list, &ar8xxx_dev_list);
+
 found:
        priv->use_count++;
 
-       if (phydev->addr == 0) {
+       if (phydev->mdio.addr == 0) {
                if (ar8xxx_has_gige(priv)) {
                        phydev->supported = SUPPORTED_1000baseT_Full;
                        phydev->advertising = ADVERTISED_1000baseT_Full;
@@ -2943,7 +2369,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);
@@ -2955,12 +2381,12 @@ found:
                        phydev->supported |= SUPPORTED_1000baseT_Full;
                        phydev->advertising |= ADVERTISED_1000baseT_Full;
                }
+               if (priv->chip->phy_rgmii_set)
+                       priv->chip->phy_rgmii_set(priv, phydev);
        }
 
        phydev->priv = priv;
 
-       list_add(&priv->list, &ar8xxx_dev_list);
-
        mutex_unlock(&ar8xxx_dev_list_lock);
 
        return 0;
@@ -3001,45 +2427,197 @@ ar8xxx_phy_remove(struct phy_device *phydev)
                return;
 
        phydev->priv = NULL;
-       if (--priv->use_count > 0)
+
+       mutex_lock(&ar8xxx_dev_list_lock);
+
+       if (--priv->use_count > 0) {
+               mutex_unlock(&ar8xxx_dev_list_lock);
+               return;
+       }
+
+       list_del(&priv->list);
+       mutex_unlock(&ar8xxx_dev_list_lock);
+
+       unregister_switch(&priv->dev);
+       ar8xxx_mib_stop(priv);
+       ar8xxx_free(priv);
+}
+
+static int
+ar8xxx_phy_soft_reset(struct phy_device *phydev)
+{
+       /* we don't need an extra reset */
+       return 0;
+}
+
+static struct phy_driver ar8xxx_phy_driver[] = {
+       {
+               .phy_id         = 0x004d0000,
+               .name           = "Atheros AR8216/AR8236/AR8316",
+               .phy_id_mask    = 0xffff0000,
+               .features       = PHY_BASIC_FEATURES,
+               .probe          = ar8xxx_phy_probe,
+               .remove         = ar8xxx_phy_remove,
+               .detach         = ar8xxx_phy_detach,
+               .config_init    = ar8xxx_phy_config_init,
+               .config_aneg    = ar8xxx_phy_config_aneg,
+               .read_status    = ar8xxx_phy_read_status,
+               .soft_reset     = ar8xxx_phy_soft_reset,
+       }
+};
+
+static const struct of_device_id ar8xxx_mdiodev_of_match[] = {
+       {
+               .compatible = "qca,ar8229",
+               .data = &ar8229_chip,
+       }, {
+               .compatible = "qca,ar8236",
+               .data = &ar8236_chip,
+       }, {
+               .compatible = "qca,ar8327",
+               .data = &ar8327_chip,
+       },
+       { /* sentinel */ },
+};
+
+static int
+ar8xxx_mdiodev_probe(struct mdio_device *mdiodev)
+{
+       const struct of_device_id *match;
+       struct ar8xxx_priv *priv;
+       struct switch_dev *swdev;
+       struct device_node *mdio_node;
+       int ret;
+
+       match = of_match_device(ar8xxx_mdiodev_of_match, &mdiodev->dev);
+       if (!match)
+               return -EINVAL;
+
+       priv = ar8xxx_create();
+       if (priv == NULL)
+               return -ENOMEM;
+
+       priv->mii_bus = mdiodev->bus;
+       priv->pdev = &mdiodev->dev;
+       priv->chip = (const struct ar8xxx_chip *) match->data;
+
+       ret = ar8xxx_read_id(priv);
+       if (ret)
+               goto free_priv;
+
+       ret = ar8xxx_probe_switch(priv);
+       if (ret)
+               goto free_priv;
+
+       if (priv->chip->phy_read && priv->chip->phy_write) {
+               priv->sw_mii_bus = devm_mdiobus_alloc(&mdiodev->dev);
+               priv->sw_mii_bus->name = "ar8xxx-mdio";
+               priv->sw_mii_bus->read = ar8xxx_phy_read;
+               priv->sw_mii_bus->write = ar8xxx_phy_write;
+               priv->sw_mii_bus->priv = priv;
+               priv->sw_mii_bus->parent = &mdiodev->dev;
+               snprintf(priv->sw_mii_bus->id, MII_BUS_ID_SIZE, "%s",
+                        dev_name(&mdiodev->dev));
+               mdio_node = of_get_child_by_name(priv->pdev->of_node, "mdio-bus");
+               ret = of_mdiobus_register(priv->sw_mii_bus, mdio_node);
+               if (ret)
+                       goto free_priv;
+       }
+
+       swdev = &priv->dev;
+       swdev->alias = dev_name(&mdiodev->dev);
+       ret = register_switch(swdev, NULL);
+       if (ret)
+               goto free_priv;
+
+       pr_info("%s: %s rev. %u switch registered on %s\n",
+               swdev->devname, swdev->name, priv->chip_rev,
+               dev_name(&priv->mii_bus->dev));
+
+       mutex_lock(&ar8xxx_dev_list_lock);
+       list_add(&priv->list, &ar8xxx_dev_list);
+       mutex_unlock(&ar8xxx_dev_list_lock);
+
+       priv->use_count++;
+
+       ret = ar8xxx_start(priv);
+       if (ret)
+               goto err_unregister_switch;
+
+       dev_set_drvdata(&mdiodev->dev, priv);
+
+       return 0;
+
+err_unregister_switch:
+       if (--priv->use_count)
+               return ret;
+
+       unregister_switch(&priv->dev);
+
+free_priv:
+       ar8xxx_free(priv);
+       return ret;
+}
+
+static void
+ar8xxx_mdiodev_remove(struct mdio_device *mdiodev)
+{
+       struct ar8xxx_priv *priv = dev_get_drvdata(&mdiodev->dev);
+
+       if (WARN_ON(!priv))
                return;
 
        mutex_lock(&ar8xxx_dev_list_lock);
+
+       if (--priv->use_count > 0) {
+               mutex_unlock(&ar8xxx_dev_list_lock);
+               return;
+       }
+
        list_del(&priv->list);
        mutex_unlock(&ar8xxx_dev_list_lock);
 
        unregister_switch(&priv->dev);
        ar8xxx_mib_stop(priv);
+       if(priv->sw_mii_bus)
+               mdiobus_unregister(priv->sw_mii_bus);
        ar8xxx_free(priv);
 }
 
-static struct phy_driver ar8xxx_phy_driver = {
-       .phy_id         = 0x004d0000,
-       .name           = "Atheros AR8216/AR8236/AR8316",
-       .phy_id_mask    = 0xffff0000,
-       .features       = PHY_BASIC_FEATURES,
-       .probe          = ar8xxx_phy_probe,
-       .remove         = ar8xxx_phy_remove,
-       .detach         = ar8xxx_phy_detach,
-       .config_init    = ar8xxx_phy_config_init,
-       .config_aneg    = ar8xxx_phy_config_aneg,
-       .read_status    = ar8xxx_phy_read_status,
-       .driver         = { .owner = THIS_MODULE },
+static struct mdio_driver ar8xxx_mdio_driver = {
+       .probe  = ar8xxx_mdiodev_probe,
+       .remove = ar8xxx_mdiodev_remove,
+       .mdiodrv.driver = {
+               .name = "ar8xxx-switch",
+               .of_match_table = ar8xxx_mdiodev_of_match,
+       },
 };
 
-int __init
-ar8xxx_init(void)
+static int __init ar8216_init(void)
 {
-       return phy_driver_register(&ar8xxx_phy_driver);
+       int ret;
+
+       ret = phy_drivers_register(ar8xxx_phy_driver,
+                                  ARRAY_SIZE(ar8xxx_phy_driver),
+                                  THIS_MODULE);
+       if (ret)
+               return ret;
+
+       ret = mdio_driver_register(&ar8xxx_mdio_driver);
+       if (ret)
+               phy_drivers_unregister(ar8xxx_phy_driver,
+                                      ARRAY_SIZE(ar8xxx_phy_driver));
+
+       return ret;
 }
+module_init(ar8216_init);
 
-void __exit
-ar8xxx_exit(void)
+static void __exit ar8216_exit(void)
 {
-       phy_driver_unregister(&ar8xxx_phy_driver);
+       mdio_driver_unregister(&ar8xxx_mdio_driver);
+       phy_drivers_unregister(ar8xxx_phy_driver,
+                               ARRAY_SIZE(ar8xxx_phy_driver));
 }
+module_exit(ar8216_exit);
 
-module_init(ar8xxx_init);
-module_exit(ar8xxx_exit);
 MODULE_LICENSE("GPL");
-