[U-Boot] [PATCH v2 2/4] dm: net: macb: Update macb_linkspd_cb() signature

[Bin Meng]

This updates DM version macb_linkspd_cb() signature for future
expansion, eg: adding an implementation for link speed changes.

Signed-off-by: Bin Meng <bmeng...@gmail.com>
Reviewed-by: Lukas Auer <lukas.a...@aisec.fraunhofer.de>
---

Changes in v2: None

 drivers/net/macb.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 7261416..b7f404e 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -488,15 +488,23 @@ static int macb_phy_find(struct macb_device *macb, const 
char *name)
 
 /**
  * macb_linkspd_cb - Linkspeed change callback function
- * @regs:      Base Register of MACB devices
+ * @dev/@regs: MACB udevice (DM version) or
+ *             Base Register of MACB devices (non-DM version)
  * @speed:     Linkspeed
  * Returns 0 when operation success and negative errno number
  * when operation failed.
  */
+#ifdef CONFIG_DM_ETH
+int __weak macb_linkspd_cb(struct udevice *dev, unsigned int speed)
+{
+       return 0;
+}
+#else
 int __weak macb_linkspd_cb(void *regs, unsigned int speed)
 {
        return 0;
 }
+#endif
 
 #ifdef CONFIG_DM_ETH
 static int macb_phy_init(struct udevice *dev, const char *name)
@@ -589,7 +597,11 @@ static int macb_phy_init(struct macb_device *macb, const 
char *name)
 
                        macb_writel(macb, NCFGR, ncfgr);
 
+#ifdef CONFIG_DM_ETH
+                       ret = macb_linkspd_cb(dev, _1000BASET);
+#else
                        ret = macb_linkspd_cb(macb->regs, _1000BASET);
+#endif
                        if (ret)
                                return ret;
 
@@ -614,9 +626,17 @@ static int macb_phy_init(struct macb_device *macb, const 
char *name)
        ncfgr &= ~(MACB_BIT(SPD) | MACB_BIT(FD) | GEM_BIT(GBE));
        if (speed) {
                ncfgr |= MACB_BIT(SPD);
+#ifdef CONFIG_DM_ETH
+               ret = macb_linkspd_cb(dev, _100BASET);
+#else
                ret = macb_linkspd_cb(macb->regs, _100BASET);
+#endif
        } else {
+#ifdef CONFIG_DM_ETH
+               ret = macb_linkspd_cb(dev, _10BASET);
+#else
                ret = macb_linkspd_cb(macb->regs, _10BASET);
+#endif
        }
 
        if (ret)
-- 
2.7.4

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot