net: sh_eth: Allocate bb_miiphy using bb_miiphy_alloc() and fill in callbacks
Allocate bb_miiphy using bb_miiphy_alloc() and fill in callbacks
currently listed in bb_miiphy_buses[] array. This is a temporary
duplication of assignment to avoid breakage, which will be removed
in follow up patches. At this point, the bb_miiphy callbacks can
reach these accessors by doing container_of() on struct mii_dev.
Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 6bd12ee..e78d64d 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -716,6 +716,7 @@
struct eth_pdata *pdata = dev_get_plat(udev);
struct sh_ether_priv *priv = dev_get_priv(udev);
struct sh_eth_dev *eth = &priv->shdev;
+ struct bb_miiphy_bus *bb_miiphy;
struct mii_dev *mdiodev;
int ret;
@@ -726,17 +727,29 @@
if (ret < 0)
return ret;
#endif
- mdiodev = mdio_alloc();
- if (!mdiodev) {
+ bb_miiphy = bb_miiphy_alloc();
+ if (!bb_miiphy) {
ret = -ENOMEM;
return ret;
}
+ mdiodev = &bb_miiphy->mii;
+
mdiodev->read = bb_miiphy_read;
mdiodev->write = bb_miiphy_write;
bb_miiphy_buses[0].priv = eth;
snprintf(mdiodev->name, sizeof(mdiodev->name), udev->name);
+ /* Copy the bus accessors, name and private data */
+ bb_miiphy->mdio_active = sh_eth_bb_mdio_active;
+ bb_miiphy->mdio_tristate = sh_eth_bb_mdio_tristate;
+ bb_miiphy->set_mdio = sh_eth_bb_set_mdio;
+ bb_miiphy->get_mdio = sh_eth_bb_get_mdio;
+ bb_miiphy->set_mdc = sh_eth_bb_set_mdc;
+ bb_miiphy->delay = sh_eth_bb_delay;
+ strlcpy(bb_miiphy->name, "sh_eth", MDIO_NAME_LEN);
+ bb_miiphy->priv = eth;
+
ret = mdio_register(mdiodev);
if (ret < 0)
goto err_mdio_register;
@@ -771,7 +784,7 @@
clk_disable(&priv->clk);
#endif
err_mdio_register:
- mdio_free(mdiodev);
+ bb_miiphy_free(bb_miiphy);
return ret;
}