Commit 99d5fe9c authored by Andrew Lunn's avatar Andrew Lunn Committed by Jakub Kicinski
Browse files

net: mdio: Remove support for building C45 muxed addresses 



The old way of performing a C45 bus transfer created a special
register value and passed it to the MDIO bus driver, in the hope it
would see the MII_ADDR_C45 bit set, and perform a C45 transfer. Now
that there is a clear separation of C22 and C45, this scheme is no
longer used. Remove all the #defines and helpers, to prevent any code
being added which tries to use it.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarMichael Walle <michael@walle.cc>
Reviewed-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 660a5704

include/linux/mdio.h

+0 −18
Original line number Diff line number Diff line
@@ -10,14 +10,6 @@ 
#include <linux/bitfield.h>

#include <linux/mod_devicetable.h>



/* Or MII_ADDR_C45 into regnum for read/write on mii_bus to enable the 21 bit

 * IEEE 802.3ae clause 45 addressing mode used by 10GIGE phy chips.

 */

#define MII_ADDR_C45		(1<<30)

#define MII_DEVADDR_C45_SHIFT	16

#define MII_DEVADDR_C45_MASK	GENMASK(20, 16)

#define MII_REGADDR_C45_MASK	GENMASK(15, 0)



struct gpio_desc;

struct mii_bus;

struct reset_control;
@@ -463,16 +455,6 @@ static inline int mdiodev_modify_changed(struct mdio_device *mdiodev, 
				      mask, set);

}



static inline u16 mdiobus_c45_regad(u32 regnum)

{

	return FIELD_GET(MII_REGADDR_C45_MASK, regnum);

}



static inline u16 mdiobus_c45_devad(u32 regnum)

{

	return FIELD_GET(MII_DEVADDR_C45_MASK, regnum);

}



static inline int mdiodev_c45_modify(struct mdio_device *mdiodev, int devad,

				     u32 regnum, u16 mask, u16 set)

{