Commit bad5532e authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-mdio-remove-support-for-building-c45-muxed-addresses' 

Michael Walle says:

====================
net: mdio: Remove support for building C45 muxed addresses

I've picked this older series from Andrew up and rebased it onto
the latest net-next.

With all drivers which support c45 now being converted to a seperate c22
and c45 access op, we can now remove the old MII_ADDR_C45 flag.
====================

Link: https://lore.kernel.org/r/20230119130700.440601-1-michael@walle.cc


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents bc170f96 99d5fe9c

drivers/net/dsa/microchip/ksz_common.c

+0 −6
Original line number Diff line number Diff line
@@ -1777,9 +1777,6 @@ static int ksz_sw_mdio_read(struct mii_bus *bus, int addr, int regnum) 
	u16 val;

	int ret;



	if (regnum & MII_ADDR_C45)

		return -EOPNOTSUPP;



	ret = dev->dev_ops->r_phy(dev, addr, regnum, &val);

	if (ret < 0)

		return ret;
@@ -1792,9 +1789,6 @@ static int ksz_sw_mdio_write(struct mii_bus *bus, int addr, int regnum, 
{

	struct ksz_device *dev = bus->priv;



	if (regnum & MII_ADDR_C45)

		return -EOPNOTSUPP;



	return dev->dev_ops->w_phy(dev, addr, regnum, val);

}

drivers/net/dsa/rzn1_a5psw.c

+0 −6
Original line number Diff line number Diff line
@@ -781,9 +781,6 @@ static int a5psw_mdio_read(struct mii_bus *bus, int phy_id, int phy_reg) 
	u32 cmd, status;

	int ret;



	if (phy_reg & MII_ADDR_C45)

		return -EOPNOTSUPP;



	cmd = A5PSW_MDIO_COMMAND_READ;

	cmd |= FIELD_PREP(A5PSW_MDIO_COMMAND_REG_ADDR, phy_reg);

	cmd |= FIELD_PREP(A5PSW_MDIO_COMMAND_PHY_ADDR, phy_id);
@@ -809,9 +806,6 @@ static int a5psw_mdio_write(struct mii_bus *bus, int phy_id, int phy_reg, 
	struct a5psw *a5psw = bus->priv;

	u32 cmd;



	if (phy_reg & MII_ADDR_C45)

		return -EOPNOTSUPP;



	cmd = FIELD_PREP(A5PSW_MDIO_COMMAND_REG_ADDR, phy_reg);

	cmd |= FIELD_PREP(A5PSW_MDIO_COMMAND_PHY_ADDR, phy_id);

drivers/net/dsa/sja1105/sja1105_mdio.c

+0 −6
Original line number Diff line number Diff line
@@ -235,9 +235,6 @@ static int sja1105_base_tx_mdio_read(struct mii_bus *bus, int phy, int reg) 
	u32 tmp;

	int rc;



	if (reg & MII_ADDR_C45)

		return -EOPNOTSUPP;



	rc = sja1105_xfer_u32(priv, SPI_READ, regs->mdio_100base_tx + reg,

			      &tmp, NULL);

	if (rc < 0)
@@ -254,9 +251,6 @@ static int sja1105_base_tx_mdio_write(struct mii_bus *bus, int phy, int reg, 
	const struct sja1105_regs *regs = priv->info->regs;

	u32 tmp = val;



	if (reg & MII_ADDR_C45)

		return -EOPNOTSUPP;



	return sja1105_xfer_u32(priv, SPI_WRITE, regs->mdio_100base_tx + reg,

				&tmp, NULL);

}

drivers/net/ethernet/actions/owl-emac.c

+0 −6
Original line number Diff line number Diff line
@@ -1275,9 +1275,6 @@ static int owl_emac_mdio_read(struct mii_bus *bus, int addr, int regnum) 
	u32 data, tmp;

	int ret;



	if (regnum & MII_ADDR_C45)

		return -EOPNOTSUPP;



	data = OWL_EMAC_BIT_MAC_CSR10_SB;

	data |= OWL_EMAC_VAL_MAC_CSR10_OPCODE_RD << OWL_EMAC_OFF_MAC_CSR10_OPCODE;
@@ -1305,9 +1302,6 @@ owl_emac_mdio_write(struct mii_bus *bus, int addr, int regnum, u16 val) 
	struct owl_emac_priv *priv = bus->priv;

	u32 data, tmp;



	if (regnum & MII_ADDR_C45)

		return -EOPNOTSUPP;



	data = OWL_EMAC_BIT_MAC_CSR10_SB;

	data |= OWL_EMAC_VAL_MAC_CSR10_OPCODE_WR << OWL_EMAC_OFF_MAC_CSR10_OPCODE;

drivers/net/ethernet/engleder/tsnep_main.c

+0 −6
Original line number Diff line number Diff line
@@ -130,9 +130,6 @@ static int tsnep_mdiobus_read(struct mii_bus *bus, int addr, int regnum) 
	u32 md;

	int retval;



	if (regnum & MII_ADDR_C45)

		return -EOPNOTSUPP;



	md = ECM_MD_READ;

	if (!adapter->suppress_preamble)

		md |= ECM_MD_PREAMBLE;
@@ -154,9 +151,6 @@ static int tsnep_mdiobus_write(struct mii_bus *bus, int addr, int regnum, 
	u32 md;

	int retval;



	if (regnum & MII_ADDR_C45)

		return -EOPNOTSUPP;



	md = ECM_MD_WRITE;

	if (!adapter->suppress_preamble)

		md |= ECM_MD_PREAMBLE;