Merge branch '2022-08-04-assorted-fixed'

[platform/kernel/u-boot.git] / drivers / net / mpc8xx_fec.c

diff --git a/drivers/net/mpc8xx_fec.c b/drivers/net/mpc8xx_fec.c
index 0a80985..4eb8260 100644 (file)
--- a/drivers/net/mpc8xx_fec.c
+++ b/drivers/net/mpc8xx_fec.c
@@ -6,11 +6,14 @@
 
 #include <common.h>
 #include <command.h>
+#include <hang.h>
 #include <malloc.h>
 #include <net.h>
 #include <netdev.h>
 #include <asm/cpm_8xx.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/delay.h>
 
 #include <phy.h>
 #include <linux/mii.h>
@@ -110,13 +113,13 @@ static struct common_buf_desc __iomem *rtx;
 
 static int fec_send(struct eth_device *dev, void *packet, int length);
 static int fec_recv(struct eth_device *dev);
-static int fec_init(struct eth_device *dev, bd_t *bd);
+static int fec_init(struct eth_device *dev, struct bd_info *bd);
 static void fec_halt(struct eth_device *dev);
 #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
 static void __mii_init(void);
 #endif
 
-int fec_initialize(bd_t *bis)
+int fec_initialize(struct bd_info *bis)
 {
        struct eth_device *dev;
        struct ether_fcc_info_s *efis;
@@ -157,7 +160,7 @@ int fec_initialize(bd_t *bis)
                struct mii_dev *mdiodev = mdio_alloc();
                if (!mdiodev)
                        return -ENOMEM;
-               strncpy(mdiodev->name, dev->name, MDIO_NAME_LEN);
+               strlcpy(mdiodev->name, dev->name, MDIO_NAME_LEN);
                mdiodev->read = fec8xx_miiphy_read;
                mdiodev->write = fec8xx_miiphy_write;
 
@@ -343,7 +346,7 @@ static inline void fec_half_duplex(struct eth_device *dev)
 
 static void fec_pin_init(int fecidx)
 {
-       bd_t           *bd = gd->bd;
+       struct bd_info           *bd = gd->bd;
        immap_t __iomem *immr = (immap_t __iomem *)CONFIG_SYS_IMMR;
 
        /*
@@ -494,7 +497,7 @@ static int fec_reset(fec_t __iomem *fecp)
        return 0;
 }
 
-static int fec_init(struct eth_device *dev, bd_t *bd)
+static int fec_init(struct eth_device *dev, struct bd_info *bd)
 {
        struct ether_fcc_info_s *efis = dev->priv;
        immap_t __iomem *immr = (immap_t __iomem *)CONFIG_SYS_IMMR;