[PATCH v3 05/23] net: sh_eth: Reorder bb_miiphy functions

Sat, 22 Feb 2025 12:37:07 -0800 

Move the bb_miiphy functions before MDIO registration. This is a
preparatory patch, the functions will be referenced around the MDIO
registration in the follow up patches. No functional change.

Signed-off-by: Marek Vasut <[email protected]>
---
Cc: Christian Marangi <[email protected]>
Cc: Ilias Apalodimas <[email protected]>
Cc: Jerome Forissier <[email protected]>
Cc: Jim Liu <[email protected]>
Cc: Joe Hershberger <[email protected]>
Cc: Mario Six <[email protected]>
Cc: Michal Simek <[email protected]>
Cc: Nobuhiro Iwamatsu <[email protected]>
Cc: Paul Barker <[email protected]>
Cc: Ramon Fried <[email protected]>
Cc: Simon Glass <[email protected]>
Cc: Sughosh Ganu <[email protected]>
Cc: Tom Rini <[email protected]>
Cc: [email protected]
---
V2: No change
V3: No change
---
 drivers/net/sh_eth.c | 136 +++++++++++++++++++++----------------------
 1 file changed, 68 insertions(+), 68 deletions(-)

diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index b607b9a3a43..6bd12ee3f19 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -643,6 +643,74 @@ static void sh_ether_stop(struct udevice *dev)
        sh_eth_stop(&priv->shdev);
 }
 
+/******* for bb_miiphy *******/
+static int sh_eth_bb_mdio_active(struct bb_miiphy_bus *bus)
+{
+       struct sh_eth_dev *eth = bus->priv;
+       struct sh_eth_info *port_info = &eth->port_info[eth->port];
+
+       sh_eth_write(port_info, sh_eth_read(port_info, PIR) | PIR_MMD, PIR);
+
+       return 0;
+}
+
+static int sh_eth_bb_mdio_tristate(struct bb_miiphy_bus *bus)
+{
+       struct sh_eth_dev *eth = bus->priv;
+       struct sh_eth_info *port_info = &eth->port_info[eth->port];
+
+       sh_eth_write(port_info, sh_eth_read(port_info, PIR) & ~PIR_MMD, PIR);
+
+       return 0;
+}
+
+static int sh_eth_bb_set_mdio(struct bb_miiphy_bus *bus, int v)
+{
+       struct sh_eth_dev *eth = bus->priv;
+       struct sh_eth_info *port_info = &eth->port_info[eth->port];
+
+       if (v)
+               sh_eth_write(port_info,
+                            sh_eth_read(port_info, PIR) | PIR_MDO, PIR);
+       else
+               sh_eth_write(port_info,
+                            sh_eth_read(port_info, PIR) & ~PIR_MDO, PIR);
+
+       return 0;
+}
+
+static int sh_eth_bb_get_mdio(struct bb_miiphy_bus *bus, int *v)
+{
+       struct sh_eth_dev *eth = bus->priv;
+       struct sh_eth_info *port_info = &eth->port_info[eth->port];
+
+       *v = (sh_eth_read(port_info, PIR) & PIR_MDI) >> 3;
+
+       return 0;
+}
+
+static int sh_eth_bb_set_mdc(struct bb_miiphy_bus *bus, int v)
+{
+       struct sh_eth_dev *eth = bus->priv;
+       struct sh_eth_info *port_info = &eth->port_info[eth->port];
+
+       if (v)
+               sh_eth_write(port_info,
+                            sh_eth_read(port_info, PIR) | PIR_MDC, PIR);
+       else
+               sh_eth_write(port_info,
+                            sh_eth_read(port_info, PIR) & ~PIR_MDC, PIR);
+
+       return 0;
+}
+
+static int sh_eth_bb_delay(struct bb_miiphy_bus *bus)
+{
+       udelay(10);
+
+       return 0;
+}
+
 static int sh_ether_probe(struct udevice *udev)
 {
        struct eth_pdata *pdata = dev_get_plat(udev);
@@ -776,74 +844,6 @@ U_BOOT_DRIVER(eth_sh_ether) = {
        .flags          = DM_FLAG_ALLOC_PRIV_DMA,
 };
 
-/******* for bb_miiphy *******/
-static int sh_eth_bb_mdio_active(struct bb_miiphy_bus *bus)
-{
-       struct sh_eth_dev *eth = bus->priv;
-       struct sh_eth_info *port_info = &eth->port_info[eth->port];
-
-       sh_eth_write(port_info, sh_eth_read(port_info, PIR) | PIR_MMD, PIR);
-
-       return 0;
-}
-
-static int sh_eth_bb_mdio_tristate(struct bb_miiphy_bus *bus)
-{
-       struct sh_eth_dev *eth = bus->priv;
-       struct sh_eth_info *port_info = &eth->port_info[eth->port];
-
-       sh_eth_write(port_info, sh_eth_read(port_info, PIR) & ~PIR_MMD, PIR);
-
-       return 0;
-}
-
-static int sh_eth_bb_set_mdio(struct bb_miiphy_bus *bus, int v)
-{
-       struct sh_eth_dev *eth = bus->priv;
-       struct sh_eth_info *port_info = &eth->port_info[eth->port];
-
-       if (v)
-               sh_eth_write(port_info,
-                            sh_eth_read(port_info, PIR) | PIR_MDO, PIR);
-       else
-               sh_eth_write(port_info,
-                            sh_eth_read(port_info, PIR) & ~PIR_MDO, PIR);
-
-       return 0;
-}
-
-static int sh_eth_bb_get_mdio(struct bb_miiphy_bus *bus, int *v)
-{
-       struct sh_eth_dev *eth = bus->priv;
-       struct sh_eth_info *port_info = &eth->port_info[eth->port];
-
-       *v = (sh_eth_read(port_info, PIR) & PIR_MDI) >> 3;
-
-       return 0;
-}
-
-static int sh_eth_bb_set_mdc(struct bb_miiphy_bus *bus, int v)
-{
-       struct sh_eth_dev *eth = bus->priv;
-       struct sh_eth_info *port_info = &eth->port_info[eth->port];
-
-       if (v)
-               sh_eth_write(port_info,
-                            sh_eth_read(port_info, PIR) | PIR_MDC, PIR);
-       else
-               sh_eth_write(port_info,
-                            sh_eth_read(port_info, PIR) & ~PIR_MDC, PIR);
-
-       return 0;
-}
-
-static int sh_eth_bb_delay(struct bb_miiphy_bus *bus)
-{
-       udelay(10);
-
-       return 0;
-}
-
 struct bb_miiphy_bus bb_miiphy_buses[] = {
        {
                .name           = "sh_eth",
-- 
2.47.2

Reply via email to