Merge tag 'v2021.01-rc5' into next

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

diff --git a/drivers/net/fm/tgec_phy.c b/drivers/net/fm/tgec_phy.c
index 095f00c..22225c2 100644 (file)
--- a/drivers/net/fm/tgec_phy.c
+++ b/drivers/net/fm/tgec_phy.c
@@ -1,15 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2009-2011 Freescale Semiconductor, Inc.
  *     Andy Fleming <afleming@gmail.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  * Some part is taken from tsec.c
  */
 #include <common.h>
 #include <miiphy.h>
 #include <phy.h>
 #include <asm/io.h>
-#include <asm/fsl_tgec.h>
+#include <fsl_tgec.h>
 #include <fm_eth.h>
 
 /*
@@ -106,7 +105,7 @@ static int tgec_mdio_reset(struct mii_dev *bus)
        return 0;
 }
 
-int fm_tgec_mdio_init(bd_t *bis, struct tgec_mdio_info *info)
+int fm_tgec_mdio_init(struct bd_info *bis, struct tgec_mdio_info *info)
 {
        struct mii_dev *bus = mdio_alloc();
 
@@ -118,7 +117,7 @@ int fm_tgec_mdio_init(bd_t *bis, struct tgec_mdio_info *info)
        bus->read = tgec_mdio_read;
        bus->write = tgec_mdio_write;
        bus->reset = tgec_mdio_reset;
-       sprintf(bus->name, info->name);
+       strcpy(bus->name, info->name);
 
        bus->priv = info->regs;