#include <linux/of_irq.h>
 #include <linux/of_address.h>
 #include <linux/of_net.h>
+#include <linux/of_mdio.h>
 #include <net/dsa.h>
 #include <linux/ethtool.h>
 #include <linux/if_bridge.h>
        return 0;
 }
 
+static int bcm_sf2_sw_indir_rw(struct bcm_sf2_priv *priv, int op, int addr,
+                              int regnum, u16 val)
+{
+       int ret = 0;
+       u32 reg;
+
+       reg = reg_readl(priv, REG_SWITCH_CNTRL);
+       reg |= MDIO_MASTER_SEL;
+       reg_writel(priv, reg, REG_SWITCH_CNTRL);
+
+       /* Page << 8 | offset */
+       reg = 0x70;
+       reg <<= 2;
+       core_writel(priv, addr, reg);
+
+       /* Page << 8 | offset */
+       reg = 0x80 << 8 | regnum << 1;
+       reg <<= 2;
+
+       if (op)
+               ret = core_readl(priv, reg);
+       else
+               core_writel(priv, val, reg);
+
+       reg = reg_readl(priv, REG_SWITCH_CNTRL);
+       reg &= ~MDIO_MASTER_SEL;
+       reg_writel(priv, reg, REG_SWITCH_CNTRL);
+
+       return ret & 0xffff;
+}
+
+static int bcm_sf2_sw_mdio_read(struct mii_bus *bus, int addr, int regnum)
+{
+       struct bcm_sf2_priv *priv = bus->priv;
+
+       /* Intercept reads from Broadcom pseudo-PHY address, else, send
+        * them to our master MDIO bus controller
+        */
+       if (addr == BRCM_PSEUDO_PHY_ADDR && priv->indir_phy_mask & BIT(addr))
+               return bcm_sf2_sw_indir_rw(priv, 1, addr, regnum, 0);
+       else
+               return mdiobus_read(priv->master_mii_bus, addr, regnum);
+}
+
+static int bcm_sf2_sw_mdio_write(struct mii_bus *bus, int addr, int regnum,
+                                u16 val)
+{
+       struct bcm_sf2_priv *priv = bus->priv;
+
+       /* Intercept writes to the Broadcom pseudo-PHY address, else,
+        * send them to our master MDIO bus controller
+        */
+       if (addr == BRCM_PSEUDO_PHY_ADDR && priv->indir_phy_mask & BIT(addr))
+               bcm_sf2_sw_indir_rw(priv, 0, addr, regnum, val);
+       else
+               mdiobus_write(priv->master_mii_bus, addr, regnum, val);
+
+       return 0;
+}
+
 static irqreturn_t bcm_sf2_switch_0_isr(int irq, void *dev_id)
 {
        struct bcm_sf2_priv *priv = dev_id;
        }
 }
 
+static int bcm_sf2_mdio_register(struct dsa_switch *ds)
+{
+       struct bcm_sf2_priv *priv = ds_to_priv(ds);
+       struct device_node *dn;
+       static int index;
+       int err;
+
+       /* Find our integrated MDIO bus node */
+       dn = of_find_compatible_node(NULL, NULL, "brcm,unimac-mdio");
+       priv->master_mii_bus = of_mdio_find_bus(dn);
+       if (!priv->master_mii_bus)
+               return -EPROBE_DEFER;
+
+       get_device(&priv->master_mii_bus->dev);
+       priv->master_mii_dn = dn;
+
+       priv->slave_mii_bus = devm_mdiobus_alloc(ds->dev);
+       if (!priv->slave_mii_bus)
+               return -ENOMEM;
+
+       priv->slave_mii_bus->priv = priv;
+       priv->slave_mii_bus->name = "sf2 slave mii";
+       priv->slave_mii_bus->read = bcm_sf2_sw_mdio_read;
+       priv->slave_mii_bus->write = bcm_sf2_sw_mdio_write;
+       snprintf(priv->slave_mii_bus->id, MII_BUS_ID_SIZE, "sf2-%d",
+                index++);
+       priv->slave_mii_bus->dev.of_node = dn;
+
+       /* Include the pseudo-PHY address to divert reads towards our
+        * workaround. This is only required for 7445D0, since 7445E0
+        * disconnects the internal switch pseudo-PHY such that we can use the
+        * regular SWITCH_MDIO master controller instead.
+        *
+        * Here we flag the pseudo PHY as needing special treatment and would
+        * otherwise make all other PHY read/writes go to the master MDIO bus
+        * controller that comes with this switch backed by the "mdio-unimac"
+        * driver.
+        */
+       if (of_machine_is_compatible("brcm,bcm7445d0"))
+               priv->indir_phy_mask |= (1 << BRCM_PSEUDO_PHY_ADDR);
+       else
+               priv->indir_phy_mask = 0;
+
+       ds->phys_mii_mask = priv->indir_phy_mask;
+       ds->slave_mii_bus = priv->slave_mii_bus;
+       priv->slave_mii_bus->parent = ds->dev->parent;
+       priv->slave_mii_bus->phy_mask = ~priv->indir_phy_mask;
+
+       if (dn)
+               err = of_mdiobus_register(priv->slave_mii_bus, dn);
+       else
+               err = mdiobus_register(priv->slave_mii_bus);
+
+       if (err)
+               of_node_put(dn);
+
+       return err;
+}
+
+static void bcm_sf2_mdio_unregister(struct bcm_sf2_priv *priv)
+{
+       mdiobus_unregister(priv->slave_mii_bus);
+       if (priv->master_mii_dn)
+               of_node_put(priv->master_mii_dn);
+}
+
 static int bcm_sf2_sw_setup(struct dsa_switch *ds)
 {
        const char *reg_names[BCM_SF2_REGS_NUM] = BCM_SF2_REGS_NAME;
                goto out_unmap;
        }
 
+       ret = bcm_sf2_mdio_register(ds);
+       if (ret) {
+               pr_err("failed to register MDIO bus\n");
+               goto out_unmap;
+       }
+
        /* Disable all interrupts and request them */
        bcm_sf2_intr_disable(priv);
 
                        bcm_sf2_port_disable(ds, port, NULL);
        }
 
-       /* Include the pseudo-PHY address and the broadcast PHY address to
-        * divert reads towards our workaround. This is only required for
-        * 7445D0, since 7445E0 disconnects the internal switch pseudo-PHY such
-        * that we can use the regular SWITCH_MDIO master controller instead.
-        *
-        * By default, DSA initializes ds->phys_mii_mask to
-        * ds->enabled_port_mask to have a 1:1 mapping between Port address
-        * and PHY address in order to utilize the slave_mii_bus instance to
-        * read from Port PHYs. This is not what we want here, so we
-        * initialize phys_mii_mask 0 to always utilize the "master" MDIO
-        * bus backed by the "mdio-unimac" driver.
-        */
-       if (of_machine_is_compatible("brcm,bcm7445d0"))
-               ds->phys_mii_mask |= ((1 << BRCM_PSEUDO_PHY_ADDR) | (1 << 0));
-       else
-               ds->phys_mii_mask = 0;
-
        rev = reg_readl(priv, REG_SWITCH_REVISION);
        priv->hw_params.top_rev = (rev >> SWITCH_TOP_REV_SHIFT) &
                                        SWITCH_TOP_REV_MASK;
                        iounmap(*base);
                base++;
        }
+       bcm_sf2_mdio_unregister(priv);
        return ret;
 }
 
        return priv->hw_params.gphy_rev;
 }
 
-static int bcm_sf2_sw_indir_rw(struct dsa_switch *ds, int op, int addr,
-                              int regnum, u16 val)
-{
-       struct bcm_sf2_priv *priv = ds_to_priv(ds);
-       int ret = 0;
-       u32 reg;
-
-       reg = reg_readl(priv, REG_SWITCH_CNTRL);
-       reg |= MDIO_MASTER_SEL;
-       reg_writel(priv, reg, REG_SWITCH_CNTRL);
-
-       /* Page << 8 | offset */
-       reg = 0x70;
-       reg <<= 2;
-       core_writel(priv, addr, reg);
-
-       /* Page << 8 | offset */
-       reg = 0x80 << 8 | regnum << 1;
-       reg <<= 2;
-
-       if (op)
-               ret = core_readl(priv, reg);
-       else
-               core_writel(priv, val, reg);
-
-       reg = reg_readl(priv, REG_SWITCH_CNTRL);
-       reg &= ~MDIO_MASTER_SEL;
-       reg_writel(priv, reg, REG_SWITCH_CNTRL);
-
-       return ret & 0xffff;
-}
-
-static int bcm_sf2_sw_phy_read(struct dsa_switch *ds, int addr, int regnum)
-{
-       /* Intercept reads from the MDIO broadcast address or Broadcom
-        * pseudo-PHY address
-        */
-       switch (addr) {
-       case 0:
-       case BRCM_PSEUDO_PHY_ADDR:
-               return bcm_sf2_sw_indir_rw(ds, 1, addr, regnum, 0);
-       default:
-               return 0xffff;
-       }
-}
-
-static int bcm_sf2_sw_phy_write(struct dsa_switch *ds, int addr, int regnum,
-                               u16 val)
-{
-       /* Intercept writes to the MDIO broadcast address or Broadcom
-        * pseudo-PHY address
-        */
-       switch (addr) {
-       case 0:
-       case BRCM_PSEUDO_PHY_ADDR:
-               bcm_sf2_sw_indir_rw(ds, 0, addr, regnum, val);
-               break;
-       }
-
-       return 0;
-}
-
 static void bcm_sf2_sw_adjust_link(struct dsa_switch *ds, int port,
                                   struct phy_device *phydev)
 {
        .setup                  = bcm_sf2_sw_setup,
        .set_addr               = bcm_sf2_sw_set_addr,
        .get_phy_flags          = bcm_sf2_sw_get_phy_flags,
-       .phy_read               = bcm_sf2_sw_phy_read,
-       .phy_write              = bcm_sf2_sw_phy_write,
        .get_strings            = bcm_sf2_sw_get_strings,
        .get_ethtool_stats      = bcm_sf2_sw_get_ethtool_stats,
        .get_sset_count         = bcm_sf2_sw_get_sset_count,