Commit 5972157c authored by Oleksij Rempel's avatar Oleksij Rempel Committed by David S. Miller
Browse files

net: mdio: of: export part of of_mdiobus_register_phy() 



This function will be needed in tja11xx driver for secondary PHY
support.

Signed-off-by: default avatarOleksij Rempel <o.rempel@pengutronix.de>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8f469506

drivers/of/of_mdio.c

+42 −31
Original line number Diff line number Diff line
@@ -60,39 +60,15 @@ static struct mii_timestamper *of_find_mii_timestamper(struct device_node *node) 
	return register_mii_timestamper(arg.np, arg.args[0]);

}



static int of_mdiobus_register_phy(struct mii_bus *mdio,

int of_mdiobus_phy_device_register(struct mii_bus *mdio, struct phy_device *phy,

			      struct device_node *child, u32 addr)

{

	struct mii_timestamper *mii_ts;

	struct phy_device *phy;

	bool is_c45;

	int rc;

	u32 phy_id;



	mii_ts = of_find_mii_timestamper(child);

	if (IS_ERR(mii_ts))

		return PTR_ERR(mii_ts);



	is_c45 = of_device_is_compatible(child,

					 "ethernet-phy-ieee802.3-c45");



	if (!is_c45 && !of_get_phy_id(child, &phy_id))

		phy = phy_device_create(mdio, addr, phy_id, 0, NULL);

	else

		phy = get_phy_device(mdio, addr, is_c45);

	if (IS_ERR(phy)) {

		if (mii_ts)

			unregister_mii_timestamper(mii_ts);

		return PTR_ERR(phy);

	}



	rc = of_irq_get(child, 0);

	if (rc == -EPROBE_DEFER) {

		if (mii_ts)

			unregister_mii_timestamper(mii_ts);

		phy_device_free(phy);

	if (rc == -EPROBE_DEFER)

		return rc;

	}



	if (rc > 0) {

		phy->irq = rc;

		mdio->irq[addr] = rc;
@@ -117,11 +93,48 @@ static int of_mdiobus_register_phy(struct mii_bus *mdio, 
	/* All data is now stored in the phy struct;

	 * register it */

	rc = phy_device_register(phy);

	if (rc) {

		of_node_put(child);

		return rc;

	}



	dev_dbg(&mdio->dev, "registered phy %pOFn at address %i\n",

		child, addr);

	return 0;

}

EXPORT_SYMBOL(of_mdiobus_phy_device_register);



static int of_mdiobus_register_phy(struct mii_bus *mdio,

				    struct device_node *child, u32 addr)

{

	struct mii_timestamper *mii_ts;

	struct phy_device *phy;

	bool is_c45;

	int rc;

	u32 phy_id;



	mii_ts = of_find_mii_timestamper(child);

	if (IS_ERR(mii_ts))

		return PTR_ERR(mii_ts);



	is_c45 = of_device_is_compatible(child,

					 "ethernet-phy-ieee802.3-c45");



	if (!is_c45 && !of_get_phy_id(child, &phy_id))

		phy = phy_device_create(mdio, addr, phy_id, 0, NULL);

	else

		phy = get_phy_device(mdio, addr, is_c45);

	if (IS_ERR(phy)) {

		if (mii_ts)

			unregister_mii_timestamper(mii_ts);

		return PTR_ERR(phy);

	}



	rc = of_mdiobus_phy_device_register(mdio, phy, child, addr);

	if (rc) {

		if (mii_ts)

			unregister_mii_timestamper(mii_ts);

		phy_device_free(phy);

		of_node_put(child);

		return rc;

	}
@@ -132,8 +145,6 @@ static int of_mdiobus_register_phy(struct mii_bus *mdio, 
	if (mii_ts)

		phy->mii_ts = mii_ts;



	dev_dbg(&mdio->dev, "registered phy %pOFn at address %i\n",

		child, addr);

	return 0;

}

include/linux/of_mdio.h

+10 −1
Original line number Diff line number Diff line
@@ -30,7 +30,9 @@ extern struct mii_bus *of_mdio_find_bus(struct device_node *mdio_np); 
extern int of_phy_register_fixed_link(struct device_node *np);

extern void of_phy_deregister_fixed_link(struct device_node *np);

extern bool of_phy_is_fixed_link(struct device_node *np);



extern int of_mdiobus_phy_device_register(struct mii_bus *mdio,

				     struct phy_device *phy,

				     struct device_node *child, u32 addr);



static inline int of_mdio_parse_addr(struct device *dev,

				     const struct device_node *np)
@@ -118,6 +120,13 @@ static inline bool of_phy_is_fixed_link(struct device_node *np) 
{

	return false;

}



static inline int of_mdiobus_phy_device_register(struct mii_bus *mdio,

					    struct phy_device *phy,

					    struct device_node *child, u32 addr)

{

	return -ENOSYS;

}

#endif