Commit 62a6ef6a authored by Marcin Wojtas's avatar Marcin Wojtas Committed by David S. Miller
Browse files

net: mdiobus: Introduce fwnode_mdbiobus_register() 



This patch introduces a new helper function that
wraps acpi_/of_ mdiobus_register() and allows its
usage via common fwnode_ interface.

Fall back to raw mdiobus_register() in case CONFIG_FWNODE_MDIO
is not enabled, in order to satisfy compatibility
in all future user drivers.

Signed-off-by: default avatarMarcin Wojtas <mw@semihalf.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7c4d7ca8

drivers/net/mdio/fwnode_mdio.c

+22 −0
Original line number Diff line number Diff line
@@ -7,8 +7,10 @@ 
 */



#include <linux/acpi.h>

#include <linux/acpi_mdio.h>

#include <linux/fwnode_mdio.h>

#include <linux/of.h>

#include <linux/of_mdio.h>

#include <linux/phy.h>



MODULE_AUTHOR("Calvin Johnson <calvin.johnson@oss.nxp.com>");
@@ -142,3 +144,23 @@ int fwnode_mdiobus_register_phy(struct mii_bus *bus, 
	return 0;

}

EXPORT_SYMBOL(fwnode_mdiobus_register_phy);



/**

 * fwnode_mdiobus_register - bring up all the PHYs on a given MDIO bus and

 *	attach them to it.

 * @bus: Target MDIO bus.

 * @fwnode: Pointer to fwnode of the MDIO controller.

 *

 * Return values are determined accordingly to acpi_/of_ mdiobus_register()

 * operation.

 */

int fwnode_mdiobus_register(struct mii_bus *bus, struct fwnode_handle *fwnode)

{

	if (is_acpi_node(fwnode))

		return acpi_mdiobus_register(bus, fwnode);

	else if (is_of_node(fwnode))

		return of_mdiobus_register(bus, to_of_node(fwnode));

	else

		return -EINVAL;

}

EXPORT_SYMBOL(fwnode_mdiobus_register);

include/linux/fwnode_mdio.h

+12 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ int fwnode_mdiobus_phy_device_register(struct mii_bus *mdio, 
int fwnode_mdiobus_register_phy(struct mii_bus *bus,

				struct fwnode_handle *child, u32 addr);



int fwnode_mdiobus_register(struct mii_bus *bus, struct fwnode_handle *fwnode);

#else /* CONFIG_FWNODE_MDIO */

int fwnode_mdiobus_phy_device_register(struct mii_bus *mdio,

				       struct phy_device *phy,
@@ -30,6 +31,17 @@ static inline int fwnode_mdiobus_register_phy(struct mii_bus *bus, 
{

	return -EINVAL;

}



static inline int fwnode_mdiobus_register(struct mii_bus *bus,

					  struct fwnode_handle *fwnode)

{

	/*

	 * Fall back to mdiobus_register() function to register a bus.

	 * This way, we don't have to keep compat bits around in drivers.

	 */



	return mdiobus_register(mdio);

}

#endif



#endif /* __LINUX_FWNODE_MDIO_H */