net: mdio: mvmdio: Convert XSMI bus to new API

The marvell MDIO driver supports two different hardware blocks. The
XSMI block is C45 only. Convert this block to the new API, and only
populate the c45 calls in the bus structure.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Michael Walle <michael@walle.cc>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/marvell/mvmdio.c b/drivers/net/ethernet/marvell/mvmdio.c
index ef87897..2d654a4 100644 (file)
--- a/drivers/net/ethernet/marvell/mvmdio.c
+++ b/drivers/net/ethernet/marvell/mvmdio.c
@@ -204,21 +204,17 @@ static const struct orion_mdio_ops orion_mdio_xsmi_ops = {
        .poll_interval_max = MVMDIO_XSMI_POLL_INTERVAL_MAX,
 };
 
-static int orion_mdio_xsmi_read(struct mii_bus *bus, int mii_id,
-                               int regnum)
+static int orion_mdio_xsmi_read_c45(struct mii_bus *bus, int mii_id,
+                                   int dev_addr, int regnum)
 {
        struct orion_mdio_dev *dev = bus->priv;
-       u16 dev_addr = (regnum >> 16) & GENMASK(4, 0);
        int ret;
 
-       if (!(regnum & MII_ADDR_C45))
-               return -EOPNOTSUPP;
-
        ret = orion_mdio_wait_ready(&orion_mdio_xsmi_ops, bus);
        if (ret < 0)
                return ret;
 
-       writel(regnum & GENMASK(15, 0), dev->regs + MVMDIO_XSMI_ADDR_REG);
+       writel(regnum, dev->regs + MVMDIO_XSMI_ADDR_REG);
        writel((mii_id << MVMDIO_XSMI_PHYADDR_SHIFT) |
               (dev_addr << MVMDIO_XSMI_DEVADDR_SHIFT) |
               MVMDIO_XSMI_READ_OPERATION,
@@ -237,21 +233,17 @@ static int orion_mdio_xsmi_read(struct mii_bus *bus, int mii_id,
        return readl(dev->regs + MVMDIO_XSMI_MGNT_REG) & GENMASK(15, 0);
 }
 
-static int orion_mdio_xsmi_write(struct mii_bus *bus, int mii_id,
-                               int regnum, u16 value)
+static int orion_mdio_xsmi_write_c45(struct mii_bus *bus, int mii_id,
+                                    int dev_addr, int regnum, u16 value)
 {
        struct orion_mdio_dev *dev = bus->priv;
-       u16 dev_addr = (regnum >> 16) & GENMASK(4, 0);
        int ret;
 
-       if (!(regnum & MII_ADDR_C45))
-               return -EOPNOTSUPP;
-
        ret = orion_mdio_wait_ready(&orion_mdio_xsmi_ops, bus);
        if (ret < 0)
                return ret;
 
-       writel(regnum & GENMASK(15, 0), dev->regs + MVMDIO_XSMI_ADDR_REG);
+       writel(regnum, dev->regs + MVMDIO_XSMI_ADDR_REG);
        writel((mii_id << MVMDIO_XSMI_PHYADDR_SHIFT) |
               (dev_addr << MVMDIO_XSMI_DEVADDR_SHIFT) |
               MVMDIO_XSMI_WRITE_OPERATION | value,
@@ -302,8 +294,8 @@ static int orion_mdio_probe(struct platform_device *pdev)
                bus->write = orion_mdio_smi_write;
                break;
        case BUS_TYPE_XSMI:
-               bus->read = orion_mdio_xsmi_read;
-               bus->write = orion_mdio_xsmi_write;
+               bus->read_c45 = orion_mdio_xsmi_read_c45;
+               bus->write_c45 = orion_mdio_xsmi_write_c45;
                break;
        }