Merge tag 'v2024.07-rc3' into next

Prepare v2024.07-rc3
author: Tom Rini <[email protected]> 2024-05-20 10:16:33 -0600
committer: Tom Rini <[email protected]> 2024-05-20 10:16:33 -0600
commit: d4781422d1268aa6deca3e49d2fb227e79c160b4 (patch)
tree: 420073c8a29a401a3908803000df6f54673e1731 /drivers/net
parent: 85854bc3324edd0c81047780ee60033d056fd490 (diff)
parent: a7f0154c412859323396111dd0c09dbafbc153cb (diff)
154 files changed, 149 insertions, 1735 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index b4ff033afa9..b2d7b499766 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -193,24 +193,6 @@ config CALXEDA_XGMAC
 	  This driver supports the XGMAC in Calxeda Highbank and Midway
 	  machines.
 
-config DWC_ETH_XGMAC
-        bool "Synopsys DWC Ethernet XGMAC device support"
-	select PHYLIB
-        help
-          This driver supports the Synopsys Designware Ethernet XGMAC (10G
-          Ethernet MAC) IP block. The IP supports many options for bus type,
-          clocking/reset structure, and feature list.
-
-config DWC_ETH_XGMAC_SOCFPGA
-	bool "Synopsys DWC Ethernet XGMAC device support for SOCFPGA"
-	select REGMAP
-	select SYSCON
-	depends on DWC_ETH_XGMAC
-	default y if TARGET_SOCFPGA_AGILEX5
-	help
-	  The Synopsys Designware Ethernet XGMAC IP block with specific
-	  configuration used in Intel SoC FPGA chip.
-
 config DRIVER_DM9000
 	bool "Davicom DM9000 controller driver"
 	help
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index dce71685c3d..dc3404519d6 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -22,8 +22,6 @@ obj-$(CONFIG_DWC_ETH_QOS) += dwc_eth_qos.o
 obj-$(CONFIG_DWC_ETH_QOS_IMX) += dwc_eth_qos_imx.o
 obj-$(CONFIG_DWC_ETH_QOS_ROCKCHIP) += dwc_eth_qos_rockchip.o
 obj-$(CONFIG_DWC_ETH_QOS_QCOM) += dwc_eth_qos_qcom.o
-obj-$(CONFIG_DWC_ETH_XGMAC) += dwc_eth_xgmac.o
-obj-$(CONFIG_DWC_ETH_XGMAC_SOCFPGA) += dwc_eth_xgmac_socfpga.o
 obj-$(CONFIG_DWC_ETH_QOS_STARFIVE) += dwc_eth_qos_starfive.o
 obj-$(CONFIG_DWC_ETH_QOS_STM32) += dwc_eth_qos_stm32.o
 obj-$(CONFIG_E1000) += e1000.o
diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c
index 059a65d4661..da1f3f45808 100644
--- a/drivers/net/ag7xxx.c
+++ b/drivers/net/ag7xxx.c
@@ -6,6 +6,7 @@
  * Copyright (C) 2019 Rosy Song <[email protected]>
  */
 
+#include <common.h>
 #include <clock_legacy.h>
 #include <cpu_func.h>
 #include <dm.h>
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index c57aafd0026..e2340936fa6 100644
--- a/drivers/net/altera_tse.c
+++ b/drivers/net/altera_tse.c
@@ -8,6 +8,7 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+#include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <errno.h>
diff --git a/drivers/net/aspeed_mdio.c b/drivers/net/aspeed_mdio.c
index f2e4392aa9a..a99715a7282 100644
--- a/drivers/net/aspeed_mdio.c
+++ b/drivers/net/aspeed_mdio.c
@@ -7,6 +7,7 @@
  * This file is inspired from the Linux kernel driver drivers/net/phy/mdio-aspeed.c
  */
 
+#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <miiphy.h>
diff --git a/drivers/net/bcm-sf2-eth-gmac.c b/drivers/net/bcm-sf2-eth-gmac.c
index ba244b4a26e..cbe1e85222f 100644
--- a/drivers/net/bcm-sf2-eth-gmac.c
+++ b/drivers/net/bcm-sf2-eth-gmac.c
@@ -11,6 +11,7 @@
 #endif
 
 #include <config.h>
+#include <common.h>
 #include <cpu_func.h>
 #include <log.h>
 #include <malloc.h>
diff --git a/drivers/net/bcm-sf2-eth.c b/drivers/net/bcm-sf2-eth.c
index c10719c6b51..1524f5c9989 100644
--- a/drivers/net/bcm-sf2-eth.c
+++ b/drivers/net/bcm-sf2-eth.c
@@ -3,6 +3,7 @@
  * Copyright 2014 Broadcom Corporation.
  */
 
+#include <common.h>
 #include <log.h>
 #include <malloc.h>
 #include <net.h>
diff --git a/drivers/net/bcm6348-eth.c b/drivers/net/bcm6348-eth.c
index f87db4ab46e..15a94f6ce9a 100644
--- a/drivers/net/bcm6348-eth.c
+++ b/drivers/net/bcm6348-eth.c
@@ -6,6 +6,7 @@
  *	Copyright (C) 2008 Maxime Bizon <[email protected]>
  */
 
+#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <dma.h>
diff --git a/drivers/net/bcm6368-eth.c b/drivers/net/bcm6368-eth.c
index 0601fcc42f5..9679a45b075 100644
--- a/drivers/net/bcm6368-eth.c
+++ b/drivers/net/bcm6368-eth.c
@@ -6,6 +6,7 @@
  *	Copyright (C) 2008 Maxime Bizon <[email protected]>
  */
 
+#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <dma.h>
diff --git a/drivers/net/bnxt/bnxt.c b/drivers/net/bnxt/bnxt.c
index 25fbcd7b116..1c9a9962408 100644
--- a/drivers/net/bnxt/bnxt.c
+++ b/drivers/net/bnxt/bnxt.c
@@ -3,6 +3,7 @@
  * Copyright 2019-2021 Broadcom.
  */
 
+#include <common.h>
 
 #include <asm/io.h>
 #include <dm.h>
diff --git a/drivers/net/calxedaxgmac.c b/drivers/net/calxedaxgmac.c
index ebb399457fb..eb1e2a756cd 100644
--- a/drivers/net/calxedaxgmac.c
+++ b/drivers/net/calxedaxgmac.c
@@ -3,6 +3,7 @@
  * Copyright 2010-2011 Calxeda, Inc.
  */
 
+#include <common.h>
 #include <malloc.h>
 #include <net.h>
 #include <linux/compiler.h>
diff --git a/drivers/net/cortina_ni.c b/drivers/net/cortina_ni.c
index 79026882800..ef6ecd88b0c 100644
--- a/drivers/net/cortina_ni.c
+++ b/drivers/net/cortina_ni.c
@@ -7,6 +7,7 @@
  * Ethernet MAC Driver for all supported CAxxxx SoCs
  */
 
+#include <common.h>
 #include <command.h>
 #include <malloc.h>
 #include <net.h>
diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c
index ce028f451f1..4e7af95b41c 100644
--- a/drivers/net/dc2114x.c
+++ b/drivers/net/dc2114x.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 
+#include <common.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <malloc.h>
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index 07b0f49ef58..682045cea2c 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -8,6 +8,7 @@
  * Designware ethernet IP driver for U-Boot
  */
 
+#include <common.h>
 #include <clk.h>
 #include <cpu_func.h>
 #include <dm.h>
diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c
index 9e17f0b9c28..bec8d67dad0 100644
--- a/drivers/net/dm9000x.c
+++ b/drivers/net/dm9000x.c
@@ -49,6 +49,7 @@
  * TODO: external MII is not functional, only internal at the moment.
  */
 
+#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <malloc.h>
diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c
index 67ac86f82bc..32a5d52165a 100644
--- a/drivers/net/dwc_eth_qos.c
+++ b/drivers/net/dwc_eth_qos.c
@@ -29,6 +29,7 @@
 
 #define LOG_CATEGORY UCLASS_ETH
 
+#include <common.h>
 #include <clk.h>
 #include <cpu_func.h>
 #include <dm.h>
diff --git a/drivers/net/dwc_eth_qos_imx.c b/drivers/net/dwc_eth_qos_imx.c
index d6bed278ca7..9c4e3904413 100644
--- a/drivers/net/dwc_eth_qos_imx.c
+++ b/drivers/net/dwc_eth_qos_imx.c
@@ -3,6 +3,7 @@
  * Copyright 2022 NXP
  */
 
+#include <common.h>
 #include <clk.h>
 #include <cpu_func.h>
 #include <dm.h>
diff --git a/drivers/net/dwc_eth_qos_qcom.c b/drivers/net/dwc_eth_qos_qcom.c
index 77d626393d5..8178138fc65 100644
--- a/drivers/net/dwc_eth_qos_qcom.c
+++ b/drivers/net/dwc_eth_qos_qcom.c
@@ -5,6 +5,7 @@
  * Qcom DWMAC specific glue layer
  */
 
+#include <common.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/drivers/net/dwc_eth_qos_rockchip.c b/drivers/net/dwc_eth_qos_rockchip.c
index c4557e57988..fa9e513faea 100644
--- a/drivers/net/dwc_eth_qos_rockchip.c
+++ b/drivers/net/dwc_eth_qos_rockchip.c
@@ -8,6 +8,7 @@
  * part in order to simplify future porting of fixes and support for other SoCs.
  */
 
+#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <dm/device_compat.h>
diff --git a/drivers/net/dwc_eth_qos_starfive.c b/drivers/net/dwc_eth_qos_starfive.c
index 09e714ce76a..5be8ac0f1a5 100644
--- a/drivers/net/dwc_eth_qos_starfive.c
+++ b/drivers/net/dwc_eth_qos_starfive.c
@@ -4,6 +4,7 @@
  * Author: Yanhong Wang<[email protected]>
  */
 
+#include <common.h>
 #include <asm/cache.h>
 #include <asm/gpio.h>
 #include <clk.h>
diff --git a/drivers/net/dwc_eth_xgmac.c b/drivers/net/dwc_eth_xgmac.c
deleted file mode 100644
index d3e5f9255f5..00000000000
--- a/drivers/net/dwc_eth_xgmac.c
+++ /dev/null
@@ -1,1165 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (c) 2023, Intel Corporation.
- *
- * Portions based on U-Boot's dwc_eth_qos.c.
- */
-
-/*
- * This driver supports the Synopsys Designware Ethernet XGMAC (10G Ethernet
- * MAC) IP block. The IP supports multiple options for bus type, clocking/
- * reset structure, and feature list.
- *
- * The driver is written such that generic core logic is kept separate from
- * configuration-specific logic. Code that interacts with configuration-
- * specific resources is split out into separate functions to avoid polluting
- * common code. If/when this driver is enhanced to support multiple
- * configurations, the core code should be adapted to call all configuration-
- * specific functions through function pointers, with the definition of those
- * function pointers being supplied by struct udevice_id xgmac_ids[]'s .data
- * field.
- *
- * This configuration uses an AXI master/DMA bus, an AHB slave/register bus,
- * contains the DMA, MTL, and MAC sub-blocks, and supports a single RGMII PHY.
- * This configuration also has SW control over all clock and reset signals to
- * the HW block.
- */
-
-#define LOG_CATEGORY UCLASS_ETH
-
-#include <clk.h>
-#include <cpu_func.h>
-#include <dm.h>
-#include <errno.h>
-#include <eth_phy.h>
-#include <log.h>
-#include <malloc.h>
-#include <memalign.h>
-#include <miiphy.h>
-#include <net.h>
-#include <netdev.h>
-#include <phy.h>
-#include <reset.h>
-#include <wait_bit.h>
-#include <asm/cache.h>
-#include <asm/gpio.h>
-#include <asm/io.h>
-#include <linux/delay.h>
-#include "dwc_eth_xgmac.h"
-
-static void *xgmac_alloc_descs(struct xgmac_priv *xgmac, unsigned int num)
-{
-	return memalign(ARCH_DMA_MINALIGN, num * xgmac->desc_size);
-}
-
-static void xgmac_free_descs(void *descs)
-{
-	free(descs);
-}
-
-static struct xgmac_desc *xgmac_get_desc(struct xgmac_priv *xgmac,
-					 unsigned int num, bool rx)
-{
-	return (rx ? xgmac->rx_descs : xgmac->tx_descs) +
-	       (num * xgmac->desc_size);
-}
-
-void xgmac_inval_desc_generic(void *desc)
-{
-	unsigned long start;
-	unsigned long end;
-
-	if (!desc) {
-		pr_err("%s invalid input buffer\n", __func__);
-		return;
-	}
-
-	start = (unsigned long)desc & ~(ARCH_DMA_MINALIGN - 1);
-	end = ALIGN(start + sizeof(struct xgmac_desc),
-		    ARCH_DMA_MINALIGN);
-
-	invalidate_dcache_range(start, end);
-}
-
-void xgmac_flush_desc_generic(void *desc)
-{
-	unsigned long start;
-	unsigned long end;
-
-	if (!desc) {
-		pr_err("%s invalid input buffer\n", __func__);
-		return;
-	}
-
-	start = (unsigned long)desc & ~(ARCH_DMA_MINALIGN - 1);
-	end = ALIGN(start + sizeof(struct xgmac_desc),
-		    ARCH_DMA_MINALIGN);
-
-	flush_dcache_range(start, end);
-}
-
-void xgmac_inval_buffer_generic(void *buf, size_t size)
-{
-	unsigned long start;
-	unsigned long end;
-
-	if (!buf) {
-		pr_err("%s invalid input buffer\n", __func__);
-		return;
-	}
-
-	start = (unsigned long)buf & ~(ARCH_DMA_MINALIGN - 1);
-	end = ALIGN((unsigned long)buf + size,
-		    ARCH_DMA_MINALIGN);
-
-	invalidate_dcache_range(start, end);
-}
-
-void xgmac_flush_buffer_generic(void *buf, size_t size)
-{
-	unsigned long start;
-	unsigned long end;
-
-	if (!buf) {
-		pr_err("%s invalid input buffer\n", __func__);
-		return;
-	}
-
-	start = (unsigned long)buf & ~(ARCH_DMA_MINALIGN - 1);
-	end = ALIGN((unsigned long)buf + size,
-		    ARCH_DMA_MINALIGN);
-
-	flush_dcache_range(start, end);
-}
-
-static int xgmac_mdio_wait_idle(struct xgmac_priv *xgmac)
-{
-	return wait_for_bit_le32(&xgmac->mac_regs->mdio_data,
-				 XGMAC_MAC_MDIO_ADDRESS_SBUSY, false,
-				 XGMAC_TIMEOUT_100MS, true);
-}
-
-static int xgmac_mdio_read(struct mii_dev *bus, int mdio_addr, int mdio_devad,
-			   int mdio_reg)
-{
-	struct xgmac_priv *xgmac = bus->priv;
-	u32 val;
-	u32 hw_addr;
-	int ret;
-
-	debug("%s(dev=%p, addr=0x%x, reg=%d):\n", __func__, xgmac->dev, mdio_addr,
-	      mdio_reg);
-
-	ret = xgmac_mdio_wait_idle(xgmac);
-	if (ret) {
-		pr_err("MDIO not idle at entry: %d\n", ret);
-		return ret;
-	}
-
-	/* Set clause 22 format */
-	val = BIT(mdio_addr);
-	writel(val, &xgmac->mac_regs->mdio_clause_22_port);
-
-	hw_addr = (mdio_addr << XGMAC_MAC_MDIO_ADDRESS_PA_SHIFT) |
-		   (mdio_reg & XGMAC_MAC_MDIO_REG_ADDR_C22P_MASK);
-
-	val = xgmac->config->config_mac_mdio <<
-	      XGMAC_MAC_MDIO_ADDRESS_CR_SHIFT;
-
-	val |= XGMAC_MAC_MDIO_ADDRESS_SADDR |
-	       XGMAC_MDIO_SINGLE_CMD_ADDR_CMD_READ |
-	       XGMAC_MAC_MDIO_ADDRESS_SBUSY;
-
-	ret = xgmac_mdio_wait_idle(xgmac);
-	if (ret) {
-		pr_err("MDIO not idle at entry: %d\n", ret);
-		return ret;
-	}
-
-	writel(hw_addr, &xgmac->mac_regs->mdio_address);
-	writel(val, &xgmac->mac_regs->mdio_data);
-
-	ret = xgmac_mdio_wait_idle(xgmac);
-	if (ret) {
-		pr_err("MDIO read didn't complete: %d\n", ret);
-		return ret;
-	}
-
-	val = readl(&xgmac->mac_regs->mdio_data);
-	val &= XGMAC_MAC_MDIO_DATA_GD_MASK;
-
-	debug("%s: val=0x%x\n", __func__, val);
-
-	return val;
-}
-
-static int xgmac_mdio_write(struct mii_dev *bus, int mdio_addr, int mdio_devad,
-			    int mdio_reg, u16 mdio_val)
-{
-	struct xgmac_priv *xgmac = bus->priv;
-	u32 val;
-	u32 hw_addr;
-	int ret;
-
-	debug("%s(dev=%p, addr=0x%x, reg=%d, val=0x%x):\n", __func__, xgmac->dev,
-	      mdio_addr, mdio_reg, mdio_val);
-
-	ret = xgmac_mdio_wait_idle(xgmac);
-	if (ret) {
-		pr_err("MDIO not idle at entry: %d\n", ret);
-		return ret;
-	}
-
-	/* Set clause 22 format */
-	val = BIT(mdio_addr);
-	writel(val, &xgmac->mac_regs->mdio_clause_22_port);
-
-	hw_addr = (mdio_addr << XGMAC_MAC_MDIO_ADDRESS_PA_SHIFT) |
-		   (mdio_reg & XGMAC_MAC_MDIO_REG_ADDR_C22P_MASK);
-
-	hw_addr |= (mdio_reg >> XGMAC_MAC_MDIO_ADDRESS_PA_SHIFT) <<
-		    XGMAC_MAC_MDIO_ADDRESS_DA_SHIFT;
-
-	val = (xgmac->config->config_mac_mdio <<
-	       XGMAC_MAC_MDIO_ADDRESS_CR_SHIFT);
-
-	val |= XGMAC_MAC_MDIO_ADDRESS_SADDR |
-		mdio_val | XGMAC_MDIO_SINGLE_CMD_ADDR_CMD_WRITE |
-		XGMAC_MAC_MDIO_ADDRESS_SBUSY;
-
-	ret = xgmac_mdio_wait_idle(xgmac);
-	if (ret) {
-		pr_err("MDIO not idle at entry: %d\n", ret);
-		return ret;
-	}
-
-	writel(hw_addr, &xgmac->mac_regs->mdio_address);
-	writel(val, &xgmac->mac_regs->mdio_data);
-
-	ret = xgmac_mdio_wait_idle(xgmac);
-	if (ret) {
-		pr_err("MDIO write didn't complete: %d\n", ret);
-		return ret;
-	}
-
-	return 0;
-}
-
-static int xgmac_set_full_duplex(struct udevice *dev)
-{
-	struct xgmac_priv *xgmac = dev_get_priv(dev);
-
-	debug("%s(dev=%p):\n", __func__, dev);
-
-	clrbits_le32(&xgmac->mac_regs->mac_extended_conf, XGMAC_MAC_EXT_CONF_HD);
-
-	return 0;
-}
-
-static int xgmac_set_half_duplex(struct udevice *dev)
-{
-	struct xgmac_priv *xgmac = dev_get_priv(dev);
-
-	debug("%s(dev=%p):\n", __func__, dev);
-
-	setbits_le32(&xgmac->mac_regs->mac_extended_conf, XGMAC_MAC_EXT_CONF_HD);
-
-	/* WAR: Flush TX queue when switching to half-duplex */
-	setbits_le32(&xgmac->mtl_regs->txq0_operation_mode,
-		     XGMAC_MTL_TXQ0_OPERATION_MODE_FTQ);
-
-	return 0;
-}
-
-static int xgmac_set_gmii_speed(struct udevice *dev)
-{
-	struct xgmac_priv *xgmac = dev_get_priv(dev);
-	u32 val;
-
-	debug("%s(dev=%p):\n", __func__, dev);
-
-	val = XGMAC_MAC_CONF_SS_1G_GMII << XGMAC_MAC_CONF_SS_SHIFT;
-	writel(val, &xgmac->mac_regs->tx_configuration);
-
-	return 0;
-}
-
-static int xgmac_set_mii_speed_100(struct udevice *dev)
-{
-	struct xgmac_priv *xgmac = dev_get_priv(dev);
-	u32 val;
-
-	debug("%s(dev=%p):\n", __func__, dev);
-
-	val = XGMAC_MAC_CONF_SS_100M_MII << XGMAC_MAC_CONF_SS_SHIFT;
-	writel(val, &xgmac->mac_regs->tx_configuration);
-
-	return 0;
-}
-
-static int xgmac_set_mii_speed_10(struct udevice *dev)
-{
-	struct xgmac_priv *xgmac = dev_get_priv(dev);
-	u32 val;
-
-	debug("%s(dev=%p):\n", __func__, dev);
-
-	val = XGMAC_MAC_CONF_SS_2_10M_MII << XGMAC_MAC_CONF_SS_SHIFT;
-	writel(val, &xgmac->mac_regs->tx_configuration);
-
-	return 0;
-}
-
-static int xgmac_adjust_link(struct udevice *dev)
-{
-	struct xgmac_priv *xgmac = dev_get_priv(dev);
-	int ret;
-	bool en_calibration;
-
-	debug("%s(dev=%p):\n", __func__, dev);
-
-	if (xgmac->phy->duplex)
-		ret = xgmac_set_full_duplex(dev);
-	else
-		ret = xgmac_set_half_duplex(dev);
-	if (ret < 0) {
-		pr_err("xgmac_set_*_duplex() failed: %d\n", ret);
-		return ret;
-	}
-
-	switch (xgmac->phy->speed) {
-	case SPEED_1000:
-		en_calibration = true;
-		ret = xgmac_set_gmii_speed(dev);
-		break;
-	case SPEED_100:
-		en_calibration = true;
-		ret = xgmac_set_mii_speed_100(dev);
-		break;
-	case SPEED_10:
-		en_calibration = false;
-		ret = xgmac_set_mii_speed_10(dev);
-		break;
-	default:
-		pr_err("invalid speed %d\n", xgmac->phy->speed);
-		return -EINVAL;
-	}
-	if (ret < 0) {
-		pr_err("xgmac_set_*mii_speed*() failed: %d\n", ret);
-		return ret;
-	}
-
-	if (en_calibration) {
-		ret = xgmac->config->ops->xgmac_calibrate_pads(dev);
-		if (ret < 0) {
-			pr_err("xgmac_calibrate_pads() failed: %d\n",
-			       ret);
-			return ret;
-		}
-	} else {
-		ret = xgmac->config->ops->xgmac_disable_calibration(dev);
-		if (ret < 0) {
-			pr_err("xgmac_disable_calibration() failed: %d\n",
-			       ret);
-			return ret;
-		}
-	}
-
-	return 0;
-}
-
-static int xgmac_write_hwaddr(struct udevice *dev)
-{
-	struct eth_pdata *plat = dev_get_plat(dev);
-	struct xgmac_priv *xgmac = dev_get_priv(dev);
-	u32 val;
-
-	/*
-	 * This function may be called before start() or after stop(). At that
-	 * time, on at least some configurations of the XGMAC HW, all clocks to
-	 * the XGMAC HW block will be stopped, and a reset signal applied. If
-	 * any register access is attempted in this state, bus timeouts or CPU
-	 * hangs may occur. This check prevents that.
-	 *
-	 * A simple solution to this problem would be to not implement
-	 * write_hwaddr(), since start() always writes the MAC address into HW
-	 * anyway. However, it is desirable to implement write_hwaddr() to
-	 * support the case of SW that runs subsequent to U-Boot which expects
-	 * the MAC address to already be programmed into the XGMAC registers,
-	 * which must happen irrespective of whether the U-Boot user (or
-	 * scripts) actually made use of the XGMAC device, and hence
-	 * irrespective of whether start() was ever called.
-	 *
-	 */
-	if (!xgmac->config->reg_access_always_ok && !xgmac->reg_access_ok)
-		return 0;
-
-	/* Update the MAC address */
-	val = (plat->enetaddr[5] << 8) |
-		(plat->enetaddr[4]);
-	writel(val, &xgmac->mac_regs->address0_high);
-	val = (plat->enetaddr[3] << 24) |
-		(plat->enetaddr[2] << 16) |
-		(plat->enetaddr[1] << 8) |
-		(plat->enetaddr[0]);
-	writel(val, &xgmac->mac_regs->address0_low);
-	return 0;
-}
-
-static int xgmac_read_rom_hwaddr(struct udevice *dev)
-{
-	struct eth_pdata *pdata = dev_get_plat(dev);
-	struct xgmac_priv *xgmac = dev_get_priv(dev);
-	int ret;
-
-	ret = xgmac->config->ops->xgmac_get_enetaddr(dev);
-	if (ret < 0)
-		return ret;
-
-	return !is_valid_ethaddr(pdata->enetaddr);
-}
-
-static int xgmac_get_phy_addr(struct xgmac_priv *priv, struct udevice *dev)
-{
-	struct ofnode_phandle_args phandle_args;
-	int reg;
-
-	if (dev_read_phandle_with_args(dev, "phy-handle", NULL, 0, 0,
-				       &phandle_args)) {
-		debug("Failed to find phy-handle");
-		return -ENODEV;
-	}
-
-	priv->phy_of_node = phandle_args.node;
-
-	reg = ofnode_read_u32_default(phandle_args.node, "reg", 0);
-
-	return reg;
-}
-
-static int xgmac_start(struct udevice *dev)
-{
-	struct xgmac_priv *xgmac = dev_get_priv(dev);
-	int ret, i;
-	u32 val, tx_fifo_sz, rx_fifo_sz, tqs, rqs, pbl;
-	ulong last_rx_desc;
-	ulong desc_pad;
-
-	struct xgmac_desc *tx_desc = NULL;
-	struct xgmac_desc *rx_desc = NULL;
-	int addr = -1;
-
-	debug("%s(dev=%p):\n", __func__, dev);
-
-	xgmac->tx_desc_idx = 0;
-	xgmac->rx_desc_idx = 0;
-
-	ret = xgmac->config->ops->xgmac_start_resets(dev);
-	if (ret < 0) {
-		pr_err("xgmac_start_resets() failed: %d\n", ret);
-		goto err;
-	}
-
-	xgmac->reg_access_ok = true;
-
-	ret = wait_for_bit_le32(&xgmac->dma_regs->mode,
-				XGMAC_DMA_MODE_SWR, false,
-				xgmac->config->swr_wait, false);
-	if (ret) {
-		pr_err("XGMAC_DMA_MODE_SWR stuck: %d\n", ret);
-		goto err_stop_resets;
-	}
-
-	ret = xgmac->config->ops->xgmac_calibrate_pads(dev);
-	if (ret < 0) {
-		pr_err("xgmac_calibrate_pads() failed: %d\n", ret);
-		goto err_stop_resets;
-	}
-
-	/*
-	 * if PHY was already connected and configured,
-	 * don't need to reconnect/reconfigure again
-	 */
-	if (!xgmac->phy) {
-		addr = xgmac_get_phy_addr(xgmac, dev);
-		xgmac->phy = phy_connect(xgmac->mii, addr, dev,
-					 xgmac->config->interface(dev));
-		if (!xgmac->phy) {
-			pr_err("phy_connect() failed\n");
-			goto err_stop_resets;
-		}
-
-		if (xgmac->max_speed) {
-			ret = phy_set_supported(xgmac->phy, xgmac->max_speed);
-			if (ret) {
-				pr_err("phy_set_supported() failed: %d\n", ret);
-				goto err_shutdown_phy;
-			}
-		}
-
-		xgmac->phy->node = xgmac->phy_of_node;
-		ret = phy_config(xgmac->phy);
-		if (ret < 0) {
-			pr_err("phy_config() failed: %d\n", ret);
-			goto err_shutdown_phy;
-		}
-	}
-
-	ret = phy_startup(xgmac->phy);
-	if (ret < 0) {
-		pr_err("phy_startup() failed: %d\n", ret);
-		goto err_shutdown_phy;
-	}
-
-	if (!xgmac->phy->link) {
-		pr_err("No link\n");
-		goto err_shutdown_phy;
-	}
-
-	ret = xgmac_adjust_link(dev);
-	if (ret < 0) {
-		pr_err("xgmac_adjust_link() failed: %d\n", ret);
-		goto err_shutdown_phy;
-	}
-
-	/* Configure MTL */
-
-	/* Enable Store and Forward mode for TX */
-	/* Program Tx operating mode */
-	setbits_le32(&xgmac->mtl_regs->txq0_operation_mode,
-		     XGMAC_MTL_TXQ0_OPERATION_MODE_TSF |
-		     (XGMAC_MTL_TXQ0_OPERATION_MODE_TXQEN_ENABLED <<
-		      XGMAC_MTL_TXQ0_OPERATION_MODE_TXQEN_SHIFT));
-
-	/* Transmit Queue weight */
-	writel(0x10, &xgmac->mtl_regs->txq0_quantum_weight);
-
-	/* Enable Store and Forward mode for RX, since no jumbo frame */
-	setbits_le32(&xgmac->mtl_regs->rxq0_operation_mode,
-		     XGMAC_MTL_RXQ0_OPERATION_MODE_RSF);
-
-	/* Transmit/Receive queue fifo size; use all RAM for 1 queue */
-	val = readl(&xgmac->mac_regs->hw_feature1);
-	tx_fifo_sz = (val >> XGMAC_MAC_HW_FEATURE1_TXFIFOSIZE_SHIFT) &
-		XGMAC_MAC_HW_FEATURE1_TXFIFOSIZE_MASK;
-	rx_fifo_sz = (val >> XGMAC_MAC_HW_FEATURE1_RXFIFOSIZE_SHIFT) &
-		XGMAC_MAC_HW_FEATURE1_RXFIFOSIZE_MASK;
-
-	/*
-	 * r/tx_fifo_sz is encoded as log2(n / 128). Undo that by shifting.
-	 * r/tqs is encoded as (n / 256) - 1.
-	 */
-	tqs = (128 << tx_fifo_sz) / 256 - 1;
-	rqs = (128 << rx_fifo_sz) / 256 - 1;
-
-	clrsetbits_le32(&xgmac->mtl_regs->txq0_operation_mode,
-			XGMAC_MTL_TXQ0_OPERATION_MODE_TQS_MASK <<
-			XGMAC_MTL_TXQ0_OPERATION_MODE_TQS_SHIFT,
-			tqs << XGMAC_MTL_TXQ0_OPERATION_MODE_TQS_SHIFT);
-	clrsetbits_le32(&xgmac->mtl_regs->rxq0_operation_mode,
-			XGMAC_MTL_RXQ0_OPERATION_MODE_RQS_MASK <<
-			XGMAC_MTL_RXQ0_OPERATION_MODE_RQS_SHIFT,
-			rqs << XGMAC_MTL_RXQ0_OPERATION_MODE_RQS_SHIFT);
-
-	setbits_le32(&xgmac->mtl_regs->rxq0_operation_mode,
-		     XGMAC_MTL_RXQ0_OPERATION_MODE_EHFC);
-
-	/* Configure MAC */
-	clrsetbits_le32(&xgmac->mac_regs->rxq_ctrl0,
-			XGMAC_MAC_RXQ_CTRL0_RXQ0EN_MASK <<
-			XGMAC_MAC_RXQ_CTRL0_RXQ0EN_SHIFT,
-			xgmac->config->config_mac <<
-			XGMAC_MAC_RXQ_CTRL0_RXQ0EN_SHIFT);
-
-	/* Multicast and Broadcast Queue Enable */
-	setbits_le32(&xgmac->mac_regs->rxq_ctrl1,
-		     XGMAC_MAC_RXQ_CTRL1_MCBCQEN);
-
-	/* enable promise mode and receive all mode */
-	setbits_le32(&xgmac->mac_regs->mac_packet_filter,
-		     XGMAC_MAC_PACKET_FILTER_RA |
-			 XGMAC_MAC_PACKET_FILTER_PR);
-
-	/* Set TX flow control parameters */
-	/* Set Pause Time */
-	setbits_le32(&xgmac->mac_regs->q0_tx_flow_ctrl,
-		     XGMAC_MAC_Q0_TX_FLOW_CTRL_PT_MASK <<
-		     XGMAC_MAC_Q0_TX_FLOW_CTRL_PT_SHIFT);
-
-	/* Assign priority for RX flow control */
-	clrbits_le32(&xgmac->mac_regs->rxq_ctrl2,
-		     XGMAC_MAC_RXQ_CTRL2_PSRQ0_MASK <<
-		     XGMAC_MAC_RXQ_CTRL2_PSRQ0_SHIFT);
-
-	/* Enable flow control */
-	setbits_le32(&xgmac->mac_regs->q0_tx_flow_ctrl,
-		     XGMAC_MAC_Q0_TX_FLOW_CTRL_TFE);
-	setbits_le32(&xgmac->mac_regs->rx_flow_ctrl,
-		     XGMAC_MAC_RX_FLOW_CTRL_RFE);
-
-	clrbits_le32(&xgmac->mac_regs->tx_configuration,
-		     XGMAC_MAC_CONF_JD);
-
-	clrbits_le32(&xgmac->mac_regs->rx_configuration,
-		     XGMAC_MAC_CONF_JE |
-		     XGMAC_MAC_CONF_GPSLCE |
-		     XGMAC_MAC_CONF_WD);
-
-	setbits_le32(&xgmac->mac_regs->rx_configuration,
-		     XGMAC_MAC_CONF_ACS |
-		     XGMAC_MAC_CONF_CST);
-
-	ret = xgmac_write_hwaddr(dev);
-	if (ret < 0) {
-		pr_err("xgmac_write_hwaddr() failed: %d\n", ret);
-		goto err;
-	}
-
-	/* Configure DMA */
-	clrsetbits_le32(&xgmac->dma_regs->sysbus_mode,
-			XGMAC_DMA_SYSBUS_MODE_AAL,
-			XGMAC_DMA_SYSBUS_MODE_EAME |
-			XGMAC_DMA_SYSBUS_MODE_UNDEF);
-
-	/* Enable OSP mode */
-	setbits_le32(&xgmac->dma_regs->ch0_tx_control,
-		     XGMAC_DMA_CH0_TX_CONTROL_OSP);
-
-	/* RX buffer size. Must be a multiple of bus width */
-	clrsetbits_le32(&xgmac->dma_regs->ch0_rx_control,
-			XGMAC_DMA_CH0_RX_CONTROL_RBSZ_MASK <<
-			XGMAC_DMA_CH0_RX_CONTROL_RBSZ_SHIFT,
-			XGMAC_MAX_PACKET_SIZE <<
-			XGMAC_DMA_CH0_RX_CONTROL_RBSZ_SHIFT);
-
-	desc_pad = (xgmac->desc_size - sizeof(struct xgmac_desc)) /
-		    xgmac->config->axi_bus_width;
-
-	setbits_le32(&xgmac->dma_regs->ch0_control,
-		     XGMAC_DMA_CH0_CONTROL_PBLX8 |
-		     (desc_pad << XGMAC_DMA_CH0_CONTROL_DSL_SHIFT));
-
-	/*
-	 * Burst length must be < 1/2 FIFO size.
-	 * FIFO size in tqs is encoded as (n / 256) - 1.
-	 * Each burst is n * 8 (PBLX8) * 16 (AXI width) == 128 bytes.
-	 * Half of n * 256 is n * 128, so pbl == tqs, modulo the -1.
-	 */
-	pbl = tqs + 1;
-	if (pbl > 32)
-		pbl = 32;
-
-	clrsetbits_le32(&xgmac->dma_regs->ch0_tx_control,
-			XGMAC_DMA_CH0_TX_CONTROL_TXPBL_MASK <<
-			XGMAC_DMA_CH0_TX_CONTROL_TXPBL_SHIFT,
-			pbl << XGMAC_DMA_CH0_TX_CONTROL_TXPBL_SHIFT);
-
-	clrsetbits_le32(&xgmac->dma_regs->ch0_rx_control,
-			XGMAC_DMA_CH0_RX_CONTROL_RXPBL_MASK <<
-			XGMAC_DMA_CH0_RX_CONTROL_RXPBL_SHIFT,
-			8 << XGMAC_DMA_CH0_RX_CONTROL_RXPBL_SHIFT);
-
-	/* DMA performance configuration */
-	val = (XGMAC_DMA_SYSBUS_MODE_RD_OSR_LMT_MASK <<
-	       XGMAC_DMA_SYSBUS_MODE_RD_OSR_LMT_SHIFT) |
-	       (XGMAC_DMA_SYSBUS_MODE_WR_OSR_LMT_MASK <<
-	       XGMAC_DMA_SYSBUS_MODE_WR_OSR_LMT_SHIFT) |
-	       XGMAC_DMA_SYSBUS_MODE_EAME |
-	       XGMAC_DMA_SYSBUS_MODE_BLEN16 |
-	       XGMAC_DMA_SYSBUS_MODE_BLEN8 |
-	       XGMAC_DMA_SYSBUS_MODE_BLEN4 |
-	       XGMAC_DMA_SYSBUS_MODE_BLEN32;
-
-	writel(val, &xgmac->dma_regs->sysbus_mode);
-
-	/* Set up descriptors */
-
-	memset(xgmac->tx_descs, 0, xgmac->desc_size * XGMAC_DESCRIPTORS_TX);
-	memset(xgmac->rx_descs, 0, xgmac->desc_size * XGMAC_DESCRIPTORS_RX);
-
-	for (i = 0; i < XGMAC_DESCRIPTORS_TX; i++) {
-		tx_desc = (struct xgmac_desc *)xgmac_get_desc(xgmac, i, false);
-
-		xgmac->config->ops->xgmac_flush_desc(tx_desc);
-	}
-
-	for (i = 0; i < XGMAC_DESCRIPTORS_RX; i++) {
-		rx_desc = (struct xgmac_desc *)xgmac_get_desc(xgmac, i, true);
-
-		rx_desc->des0 = (uintptr_t)(xgmac->rx_dma_buf +
-					    (i * XGMAC_MAX_PACKET_SIZE));
-		rx_desc->des3 = XGMAC_DESC3_OWN;
-		/* Flush the cache to the memory */
-		mb();
-		xgmac->config->ops->xgmac_flush_desc(rx_desc);
-		xgmac->config->ops->xgmac_inval_buffer(xgmac->rx_dma_buf +
-						       (i * XGMAC_MAX_PACKET_SIZE),
-						       XGMAC_MAX_PACKET_SIZE);
-	}
-
-	writel(0, &xgmac->dma_regs->ch0_txdesc_list_haddress);
-	writel((ulong)xgmac_get_desc(xgmac, 0, false),
-	       &xgmac->dma_regs->ch0_txdesc_list_address);
-	writel(XGMAC_DESCRIPTORS_TX - 1,
-	       &xgmac->dma_regs->ch0_txdesc_ring_length);
-	writel(0, &xgmac->dma_regs->ch0_rxdesc_list_haddress);
-	writel((ulong)xgmac_get_desc(xgmac, 0, true),
-	       &xgmac->dma_regs->ch0_rxdesc_list_address);
-	writel(XGMAC_DESCRIPTORS_RX - 1,
-	       &xgmac->dma_regs->ch0_rxdesc_ring_length);
-
-	/* Enable everything */
-	setbits_le32(&xgmac->dma_regs->ch0_tx_control,
-		     XGMAC_DMA_CH0_TX_CONTROL_ST);
-	setbits_le32(&xgmac->dma_regs->ch0_rx_control,
-		     XGMAC_DMA_CH0_RX_CONTROL_SR);
-	setbits_le32(&xgmac->mac_regs->tx_configuration,
-		     XGMAC_MAC_CONF_TE);
-	setbits_le32(&xgmac->mac_regs->rx_configuration,
-		     XGMAC_MAC_CONF_RE);
-
-	/* TX tail pointer not written until we need to TX a packet */
-	/*
-	 * Point RX tail pointer at last descriptor. Ideally, we'd point at the
-	 * first descriptor, implying all descriptors were available. However,
-	 * that's not distinguishable from none of the descriptors being
-	 * available.
-	 */
-	last_rx_desc = (ulong)xgmac_get_desc(xgmac, XGMAC_DESCRIPTORS_RX - 1, true);
-	writel(last_rx_desc, &xgmac->dma_regs->ch0_rxdesc_tail_pointer);
-
-	xgmac->started = true;
-
-	debug("%s: OK\n", __func__);
-	return 0;
-
-err_shutdown_phy:
-	phy_shutdown(xgmac->phy);
-err_stop_resets:
-	xgmac->config->ops->xgmac_stop_resets(dev);
-err:
-	pr_err("FAILED: %d\n", ret);
-	return ret;
-}
-
-static void xgmac_stop(struct udevice *dev)
-{
-	struct xgmac_priv *xgmac = dev_get_priv(dev);
-	unsigned long start_time;
-	u32 val;
-	u32 trcsts;
-	u32 txqsts;
-	u32 prxq;
-	u32 rxqsts;
-
-	debug("%s(dev=%p):\n", __func__, dev);
-
-	if (!xgmac->started)
-		return;
-	xgmac->started = false;
-	xgmac->reg_access_ok = false;
-
-	/* Disable TX DMA */
-	clrbits_le32(&xgmac->dma_regs->ch0_tx_control,
-		     XGMAC_DMA_CH0_TX_CONTROL_ST);
-
-	/* Wait for TX all packets to drain out of MTL */
-	start_time = get_timer(0);
-
-	while (get_timer(start_time) < XGMAC_TIMEOUT_100MS) {
-		val = readl(&xgmac->mtl_regs->txq0_debug);
-
-		trcsts = (val >> XGMAC_MTL_TXQ0_DEBUG_TRCSTS_SHIFT) &
-			  XGMAC_MTL_TXQ0_DEBUG_TRCSTS_MASK;
-
-		txqsts = val & XGMAC_MTL_TXQ0_DEBUG_TXQSTS;
-
-		if (trcsts != XGMAC_MTL_TXQ0_DEBUG_TRCSTS_READ_STATE && !txqsts)
-			break;
-	}
-
-	/* Turn off MAC TX and RX */
-	clrbits_le32(&xgmac->mac_regs->tx_configuration,
-		     XGMAC_MAC_CONF_RE);
-	clrbits_le32(&xgmac->mac_regs->rx_configuration,
-		     XGMAC_MAC_CONF_RE);
-
-	/* Wait for all RX packets to drain out of MTL */
-	start_time = get_timer(0);
-
-	while (get_timer(start_time) < XGMAC_TIMEOUT_100MS) {
-		val = readl(&xgmac->mtl_regs->rxq0_debug);
-
-		prxq = (val >> XGMAC_MTL_RXQ0_DEBUG_PRXQ_SHIFT) &
-			XGMAC_MTL_RXQ0_DEBUG_PRXQ_MASK;
-
-		rxqsts = (val >> XGMAC_MTL_RXQ0_DEBUG_RXQSTS_SHIFT) &
-			  XGMAC_MTL_RXQ0_DEBUG_RXQSTS_MASK;
-
-		if (!prxq && !rxqsts)
-			break;
-	}
-
-	/* Turn off RX DMA */
-	clrbits_le32(&xgmac->dma_regs->ch0_rx_control,
-		     XGMAC_DMA_CH0_RX_CONTROL_SR);
-
-	if (xgmac->phy)
-		phy_shutdown(xgmac->phy);
-
-	xgmac->config->ops->xgmac_stop_resets(dev);
-
-	debug("%s: OK\n", __func__);
-}
-
-static int xgmac_send(struct udevice *dev, void *packet, int length)
-{
-	struct xgmac_priv *xgmac = dev_get_priv(dev);
-	struct xgmac_desc *tx_desc;
-	unsigned long start_time;
-
-	debug("%s(dev=%p, packet=%p, length=%d):\n", __func__, dev, packet,
-	      length);
-
-	memcpy(xgmac->tx_dma_buf, packet, length);
-	xgmac->config->ops->xgmac_flush_buffer(xgmac->tx_dma_buf, length);
-
-	tx_desc = xgmac_get_desc(xgmac, xgmac->tx_desc_idx, false);
-	xgmac->tx_desc_idx++;
-	xgmac->tx_desc_idx %= XGMAC_DESCRIPTORS_TX;
-
-	tx_desc->des0 = (ulong)xgmac->tx_dma_buf;
-	tx_desc->des1 = 0;
-	tx_desc->des2 = length;
-	/*
-	 * Make sure that if HW sees the _OWN write below, it will see all the
-	 * writes to the rest of the descriptor too.
-	 */
-	mb();
-	tx_desc->des3 = XGMAC_DESC3_OWN | XGMAC_DESC3_FD | XGMAC_DESC3_LD | length;
-	xgmac->config->ops->xgmac_flush_desc(tx_desc);
-
-	writel((ulong)xgmac_get_desc(xgmac, xgmac->tx_desc_idx, false),
-	       &xgmac->dma_regs->ch0_txdesc_tail_pointer);
-
-	start_time = get_timer(0);
-
-	while (get_timer(start_time) < XGMAC_TIMEOUT_100MS) {
-		xgmac->config->ops->xgmac_inval_desc(tx_desc);
-		if (!(readl(&tx_desc->des3) & XGMAC_DESC3_OWN))
-			return 0;
-	}
-	debug("%s: TX timeout\n", __func__);
-
-	return -ETIMEDOUT;
-}
-
-static int xgmac_recv(struct udevice *dev, int flags, uchar **packetp)
-{
-	struct xgmac_priv *xgmac = dev_get_priv(dev);
-	struct xgmac_desc *rx_desc;
-	int length;
-
-	debug("%s(dev=%p, flags=0x%x):\n", __func__, dev, flags);
-
-	rx_desc = xgmac_get_desc(xgmac, xgmac->rx_desc_idx, true);
-	xgmac->config->ops->xgmac_inval_desc(rx_desc);
-	if (rx_desc->des3 & XGMAC_DESC3_OWN) {
-		debug("%s: RX packet not available\n", __func__);
-		return -EAGAIN;
-	}
-
-	*packetp = xgmac->rx_dma_buf +
-		   (xgmac->rx_desc_idx * XGMAC_MAX_PACKET_SIZE);
-	length = rx_desc->des3 & XGMAC_RDES3_PKT_LENGTH_MASK;
-	debug("%s: *packetp=%p, length=%d\n", __func__, *packetp, length);
-
-	xgmac->config->ops->xgmac_inval_buffer(*packetp, length);
-
-	return length;
-}
-
-static int xgmac_free_pkt(struct udevice *dev, uchar *packet, int length)
-{
-	struct xgmac_priv *xgmac = dev_get_priv(dev);
-	u32 idx, idx_mask = xgmac->desc_per_cacheline - 1;
-	uchar *packet_expected;
-	struct xgmac_desc *rx_desc;
-
-	debug("%s(packet=%p, length=%d)\n", __func__, packet, length);
-
-	packet_expected = xgmac->rx_dma_buf +
-			  (xgmac->rx_desc_idx * XGMAC_MAX_PACKET_SIZE);
-	if (packet != packet_expected) {
-		debug("%s: Unexpected packet (expected %p)\n", __func__,
-		      packet_expected);
-		return -EINVAL;
-	}
-
-	xgmac->config->ops->xgmac_inval_buffer(packet, length);
-
-	if ((xgmac->rx_desc_idx & idx_mask) == idx_mask) {
-		for (idx = xgmac->rx_desc_idx - idx_mask;
-		     idx <= xgmac->rx_desc_idx;
-		     idx++) {
-			rx_desc = xgmac_get_desc(xgmac, idx, true);
-			rx_desc->des0 = 0;
-			/* Flush the cache to the memory */
-			mb();
-			xgmac->config->ops->xgmac_flush_desc(rx_desc);
-			xgmac->config->ops->xgmac_inval_buffer(packet, length);
-			rx_desc->des0 = (u32)(ulong)(xgmac->rx_dma_buf +
-					     (idx * XGMAC_MAX_PACKET_SIZE));
-			rx_desc->des1 = 0;
-			rx_desc->des2 = 0;
-			/*
-			 * Make sure that if HW sees the _OWN write below,
-			 * it will see all the writes to the rest of the
-			 * descriptor too.
-			 */
-			mb();
-			rx_desc->des3 = XGMAC_DESC3_OWN;
-			xgmac->config->ops->xgmac_flush_desc(rx_desc);
-		}
-		writel((ulong)rx_desc, &xgmac->dma_regs->ch0_rxdesc_tail_pointer);
-	}
-
-	xgmac->rx_desc_idx++;
-	xgmac->rx_desc_idx %= XGMAC_DESCRIPTORS_RX;
-
-	return 0;
-}
-
-static int xgmac_probe_resources_core(struct udevice *dev)
-{
-	struct xgmac_priv *xgmac = dev_get_priv(dev);
-	unsigned int desc_step;
-	int ret;
-
-	debug("%s(dev=%p):\n", __func__, dev);
-
-	/* Maximum distance between neighboring descriptors, in Bytes. */
-	desc_step = sizeof(struct xgmac_desc);
-
-	if (desc_step < ARCH_DMA_MINALIGN) {
-		/*
-		 * The hardware implementation cannot place one descriptor
-		 * per cacheline, it is necessary to place multiple descriptors
-		 * per cacheline in memory and do cache management carefully.
-		 */
-		xgmac->desc_size = BIT(fls(desc_step) - 1);
-	} else {
-		xgmac->desc_size = ALIGN(sizeof(struct xgmac_desc),
-					 (unsigned int)ARCH_DMA_MINALIGN);
-	}
-	xgmac->desc_per_cacheline = ARCH_DMA_MINALIGN / xgmac->desc_size;
-
-	xgmac->tx_descs = xgmac_alloc_descs(xgmac, XGMAC_DESCRIPTORS_TX);
-	if (!xgmac->tx_descs) {
-		debug("%s: xgmac_alloc_descs(tx) failed\n", __func__);
-		ret = -ENOMEM;
-		goto err;
-	}
-
-	xgmac->rx_descs = xgmac_alloc_descs(xgmac, XGMAC_DESCRIPTORS_RX);
-	if (!xgmac->rx_descs) {
-		debug("%s: xgmac_alloc_descs(rx) failed\n", __func__);
-		ret = -ENOMEM;
-		goto err_free_tx_descs;
-	}
-
-	xgmac->tx_dma_buf = memalign(XGMAC_BUFFER_ALIGN, XGMAC_MAX_PACKET_SIZE);
-	if (!xgmac->tx_dma_buf) {
-		debug("%s: memalign(tx_dma_buf) failed\n", __func__);
-		ret = -ENOMEM;
-		goto err_free_descs;
-	}
-	debug("%s: tx_dma_buf=%p\n", __func__, xgmac->tx_dma_buf);
-
-	xgmac->rx_dma_buf = memalign(XGMAC_BUFFER_ALIGN, XGMAC_RX_BUFFER_SIZE);
-	if (!xgmac->rx_dma_buf) {
-		debug("%s: memalign(rx_dma_buf) failed\n", __func__);
-		ret = -ENOMEM;
-		goto err_free_tx_dma_buf;
-	}
-	debug("%s: rx_dma_buf=%p\n", __func__, xgmac->rx_dma_buf);
-
-	xgmac->rx_pkt = malloc(XGMAC_MAX_PACKET_SIZE);
-	if (!xgmac->rx_pkt) {
-		debug("%s: malloc(rx_pkt) failed\n", __func__);
-		ret = -ENOMEM;
-		goto err_free_rx_dma_buf;
-	}
-	debug("%s: rx_pkt=%p\n", __func__, xgmac->rx_pkt);
-
-	xgmac->config->ops->xgmac_inval_buffer(xgmac->rx_dma_buf,
-			XGMAC_MAX_PACKET_SIZE * XGMAC_DESCRIPTORS_RX);
-
-	debug("%s: OK\n", __func__);
-	return 0;
-
-err_free_rx_dma_buf:
-	free(xgmac->rx_dma_buf);
-err_free_tx_dma_buf:
-	free(xgmac->tx_dma_buf);
-err_free_descs:
-	xgmac_free_descs(xgmac->rx_descs);
-err_free_tx_descs:
-	xgmac_free_descs(xgmac->tx_descs);
-err:
-
-	debug("%s: returns %d\n", __func__, ret);
-	return ret;
-}
-
-static int xgmac_remove_resources_core(struct udevice *dev)
-{
-	struct xgmac_priv *xgmac = dev_get_priv(dev);
-
-	debug("%s(dev=%p):\n", __func__, dev);
-
-	free(xgmac->rx_pkt);
-	free(xgmac->rx_dma_buf);
-	free(xgmac->tx_dma_buf);
-	xgmac_free_descs(xgmac->rx_descs);
-	xgmac_free_descs(xgmac->tx_descs);
-
-	debug("%s: OK\n", __func__);
-	return 0;
-}
-
-/* board-specific Ethernet Interface initializations. */
-__weak int board_interface_eth_init(struct udevice *dev,
-				    phy_interface_t interface_type)
-{
-	return 0;
-}
-
-static int xgmac_probe(struct udevice *dev)
-{
-	struct xgmac_priv *xgmac = dev_get_priv(dev);
-	int ret;
-
-	debug("%s(dev=%p):\n", __func__, dev);
-
-	xgmac->dev = dev;
-	xgmac->config = (void *)dev_get_driver_data(dev);
-
-	xgmac->regs = dev_read_addr(dev);
-	if (xgmac->regs == FDT_ADDR_T_NONE) {
-		pr_err("dev_read_addr() failed\n");
-		return -ENODEV;
-	}
-	xgmac->mac_regs = (void *)(xgmac->regs + XGMAC_MAC_REGS_BASE);
-	xgmac->mtl_regs = (void *)(xgmac->regs + XGMAC_MTL_REGS_BASE);
-	xgmac->dma_regs = (void *)(xgmac->regs + XGMAC_DMA_REGS_BASE);
-
-	xgmac->max_speed = dev_read_u32_default(dev, "max-speed", 0);
-
-	ret = xgmac_probe_resources_core(dev);
-	if (ret < 0) {
-		pr_err("xgmac_probe_resources_core() failed: %d\n", ret);
-		return ret;
-	}
-
-	ret = xgmac->config->ops->xgmac_probe_resources(dev);
-	if (ret < 0) {
-		pr_err("xgmac_probe_resources() failed: %d\n", ret);
-		goto err_remove_resources_core;
-	}
-
-	ret = xgmac->config->ops->xgmac_start_clks(dev);
-	if (ret < 0) {
-		pr_err("xgmac_start_clks() failed: %d\n", ret);
-		return ret;
-	}
-
-	if (IS_ENABLED(CONFIG_DM_ETH_PHY))
-		xgmac->mii = eth_phy_get_mdio_bus(dev);
-
-	if (!xgmac->mii) {
-		xgmac->mii = mdio_alloc();
-		if (!xgmac->mii) {
-			pr_err("mdio_alloc() failed\n");
-			ret = -ENOMEM;
-			goto err_stop_clks;
-		}
-		xgmac->mii->read = xgmac_mdio_read;
-		xgmac->mii->write = xgmac_mdio_write;
-		xgmac->mii->priv = xgmac;
-		strcpy(xgmac->mii->name, dev->name);
-
-		ret = mdio_register(xgmac->mii);
-		if (ret < 0) {
-			pr_err("mdio_register() failed: %d\n", ret);
-			goto err_free_mdio;
-		}
-	}
-
-	if (IS_ENABLED(CONFIG_DM_ETH_PHY))
-		eth_phy_set_mdio_bus(dev, xgmac->mii);
-
-	debug("%s: OK\n", __func__);
-	return 0;
-
-err_free_mdio:
-	mdio_free(xgmac->mii);
-err_stop_clks:
-	xgmac->config->ops->xgmac_stop_clks(dev);
-err_remove_resources_core:
-	xgmac_remove_resources_core(dev);
-
-	debug("%s: returns %d\n", __func__, ret);
-	return ret;
-}
-
-static int xgmac_remove(struct udevice *dev)
-{
-	struct xgmac_priv *xgmac = dev_get_priv(dev);
-
-	debug("%s(dev=%p):\n", __func__, dev);
-
-	mdio_unregister(xgmac->mii);
-	mdio_free(xgmac->mii);
-	xgmac->config->ops->xgmac_stop_clks(dev);
-	xgmac->config->ops->xgmac_remove_resources(dev);
-
-	xgmac_remove_resources_core(dev);
-
-	debug("%s: OK\n", __func__);
-	return 0;
-}
-
-int xgmac_null_ops(struct udevice *dev)
-{
-	return 0;
-}
-
-static const struct eth_ops xgmac_ops = {
-	.start = xgmac_start,
-	.stop = xgmac_stop,
-	.send = xgmac_send,
-	.recv = xgmac_recv,
-	.free_pkt = xgmac_free_pkt,
-	.write_hwaddr = xgmac_write_hwaddr,
-	.read_rom_hwaddr = xgmac_read_rom_hwaddr,
-};
-
-static const struct udevice_id xgmac_ids[] = {
-	{
-		.compatible = "intel,socfpga-dwxgmac",
-		.data = (ulong)&xgmac_socfpga_config
-	},
-	{ }
-};
-
-U_BOOT_DRIVER(eth_xgmac) = {
-	.name = "eth_xgmac",
-	.id = UCLASS_ETH,
-	.of_match = of_match_ptr(xgmac_ids),
-	.probe = xgmac_probe,
-	.remove = xgmac_remove,
-	.ops = &xgmac_ops,
-	.priv_auto = sizeof(struct xgmac_priv),
-	.plat_auto = sizeof(struct eth_pdata),
-};
diff --git a/drivers/net/dwc_eth_xgmac.h b/drivers/net/dwc_eth_xgmac.h
deleted file mode 100644
index 259f815f3f2..00000000000
--- a/drivers/net/dwc_eth_xgmac.h
+++ /dev/null
@@ -1,298 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright 2023 Intel Coporation.
- */
-
-#include <phy_interface.h>
-#include <linux/bitops.h>
-
-/* Core registers */
-
-#define XGMAC_MAC_REGS_BASE 0x000
-
-struct xgmac_mac_regs {
-	u32 tx_configuration;			/* 0x000 */
-	u32 rx_configuration;			/* 0x004 */
-	u32 mac_packet_filter;			/* 0x008 */
-	u32 unused_00c[(0x070 - 0x00c) / 4];	/* 0x00c */
-	u32 q0_tx_flow_ctrl;			/* 0x070 */
-	u32 unused_070[(0x090 - 0x074) / 4];	/* 0x074 */
-	u32 rx_flow_ctrl;			/* 0x090 */
-	u32 unused_094[(0x0a0 - 0x094) / 4];	/* 0x094 */
-	u32 rxq_ctrl0;				/* 0x0a0 */
-	u32 rxq_ctrl1;				/* 0x0a4 */
-	u32 rxq_ctrl2;				/* 0x0a8 */
-	u32 unused_0ac[(0x0dc - 0x0ac) / 4];	/* 0x0ac */
-	u32 us_tic_counter;			/* 0x0dc */
-	u32 unused_0e0[(0x11c - 0x0e0) / 4];	/* 0x0e0 */
-	u32 hw_feature0;			/* 0x11c */
-	u32 hw_feature1;			/* 0x120 */
-	u32 hw_feature2;			/* 0x124 */
-	u32 hw_feature3;			/* 0x128 */
-	u32 hw_feature4;			/* 0x12c */
-	u32 unused_130[(0x140 - 0x130) / 4];	/* 0x130 */
-	u32 mac_extended_conf;			/* 0x140 */
-	u32 unused_144[(0x200 - 0x144) / 4];	/* 0x144 */
-	u32 mdio_address;			/* 0x200 */
-	u32 mdio_data;				/* 0x204 */
-	u32 mdio_cont_write_addr;		/* 0x208 */
-	u32 mdio_cont_write_data;		/* 0x20c */
-	u32 mdio_cont_scan_port_enable;		/* 0x210 */
-	u32 mdio_intr_status;			/* 0x214 */
-	u32 mdio_intr_enable;			/* 0x218 */
-	u32 mdio_port_cnct_dsnct_status;	/* 0x21c */
-	u32 mdio_clause_22_port;		/* 0x220 */
-	u32 unused_224[(0x300 - 0x224)	/ 4];	/* 0x224 */
-	u32 address0_high;			/* 0x300 */
-	u32 address0_low;			/* 0x304 */
-};
-
-#define XGMAC_TIMEOUT_100MS			100000
-#define XGMAC_MAC_CONF_SS_SHIFT			29
-#define XGMAC_MAC_CONF_SS_10G_XGMII		0
-#define XGMAC_MAC_CONF_SS_2_5G_GMII		2
-#define XGMAC_MAC_CONF_SS_1G_GMII		3
-#define XGMAC_MAC_CONF_SS_100M_MII		4
-#define XGMAC_MAC_CONF_SS_5G_XGMII		5
-#define XGMAC_MAC_CONF_SS_2_5G_XGMII		6
-#define XGMAC_MAC_CONF_SS_2_10M_MII		7
-
-#define XGMAC_MAC_CONF_JD			BIT(16)
-#define XGMAC_MAC_CONF_JE			BIT(8)
-#define XGMAC_MAC_CONF_WD			BIT(7)
-#define XGMAC_MAC_CONF_GPSLCE			BIT(6)
-#define XGMAC_MAC_CONF_CST			BIT(2)
-#define XGMAC_MAC_CONF_ACS			BIT(1)
-#define XGMAC_MAC_CONF_TE			BIT(0)
-#define XGMAC_MAC_CONF_RE			BIT(0)
-
-#define XGMAC_MAC_EXT_CONF_HD			BIT(24)
-
-#define XGMAC_MAC_PACKET_FILTER_RA		BIT(31)
-#define XGMAC_MAC_PACKET_FILTER_PR		BIT(0)
-
-#define XGMAC_MAC_Q0_TX_FLOW_CTRL_PT_SHIFT	16
-#define XGMAC_MAC_Q0_TX_FLOW_CTRL_PT_MASK	GENMASK(15, 0)
-#define XGMAC_MAC_Q0_TX_FLOW_CTRL_TFE		BIT(1)
-
-#define XGMAC_MAC_RX_FLOW_CTRL_RFE		BIT(0)
-#define XGMAC_MAC_RXQ_CTRL0_RXQ0EN_SHIFT	0
-#define XGMAC_MAC_RXQ_CTRL0_RXQ0EN_MASK		GENMASK(1, 0)
-#define XGMAC_MAC_RXQ_CTRL0_RXQ0EN_NOT_ENABLED	0
-#define XGMAC_MAC_RXQ_CTRL0_RXQ0EN_ENABLED_DCB	2
-#define XGMAC_MAC_RXQ_CTRL0_RXQ0EN_ENABLED_AV	1
-
-#define XGMAC_MAC_RXQ_CTRL1_MCBCQEN		BIT(15)
-
-#define XGMAC_MAC_RXQ_CTRL2_PSRQ0_SHIFT		0
-#define XGMAC_MAC_RXQ_CTRL2_PSRQ0_MASK		GENMASK(7, 0)
-
-#define XGMAC_MAC_HW_FEATURE1_TXFIFOSIZE_SHIFT	6
-#define XGMAC_MAC_HW_FEATURE1_TXFIFOSIZE_MASK	GENMASK(4, 0)
-#define XGMAC_MAC_HW_FEATURE1_RXFIFOSIZE_SHIFT	0
-#define XGMAC_MAC_HW_FEATURE1_RXFIFOSIZE_MASK	GENMASK(4, 0)
-
-#define XGMAC_MDIO_SINGLE_CMD_SHIFT		16
-#define XGMAC_MDIO_SINGLE_CMD_ADDR_CMD_READ	3 << XGMAC_MDIO_SINGLE_CMD_SHIFT
-#define XGMAC_MDIO_SINGLE_CMD_ADDR_CMD_WRITE	BIT(16)
-#define XGMAC_MAC_MDIO_ADDRESS_PA_SHIFT		16
-#define XGMAC_MAC_MDIO_ADDRESS_PA_MASK		GENMASK(15, 0)
-#define XGMAC_MAC_MDIO_ADDRESS_DA_SHIFT		21
-#define XGMAC_MAC_MDIO_ADDRESS_CR_SHIFT		19
-#define XGMAC_MAC_MDIO_ADDRESS_CR_100_150	0
-#define XGMAC_MAC_MDIO_ADDRESS_CR_150_250	1
-#define XGMAC_MAC_MDIO_ADDRESS_CR_250_300	2
-#define XGMAC_MAC_MDIO_ADDRESS_CR_300_350	3
-#define XGMAC_MAC_MDIO_ADDRESS_CR_350_400	4
-#define XGMAC_MAC_MDIO_ADDRESS_CR_400_500	5
-#define XGMAC_MAC_MDIO_ADDRESS_SADDR		BIT(18)
-#define XGMAC_MAC_MDIO_ADDRESS_SBUSY		BIT(22)
-#define XGMAC_MAC_MDIO_REG_ADDR_C22P_MASK	GENMASK(4, 0)
-#define XGMAC_MAC_MDIO_DATA_GD_MASK		GENMASK(15, 0)
-
-/* MTL Registers */
-
-#define XGMAC_MTL_REGS_BASE 0x1000
-
-struct xgmac_mtl_regs {
-	u32 mtl_operation_mode;			/* 0x1000 */
-	u32 unused_1004[(0x1030 - 0x1004) / 4];	/* 0x1004 */
-	u32 mtl_rxq_dma_map0;			/* 0x1030 */
-	u32 mtl_rxq_dma_map1;			/* 0x1034 */
-	u32 mtl_rxq_dma_map2;			/* 0x1038 */
-	u32 mtl_rxq_dma_map3;			/* 0x103c */
-	u32 mtl_tc_prty_map0;			/* 0x1040 */
-	u32 mtl_tc_prty_map1;			/* 0x1044 */
-	u32 unused_1048[(0x1100 - 0x1048) / 4]; /* 0x1048 */
-	u32 txq0_operation_mode;		/* 0x1100 */
-	u32 unused_1104;			/* 0x1104 */
-	u32 txq0_debug;				/* 0x1108 */
-	u32 unused_100c[(0x1118 - 0x110c) / 4];	/* 0x110c */
-	u32 txq0_quantum_weight;		/* 0x1118 */
-	u32 unused_111c[(0x1140 - 0x111c) / 4];	/* 0x111c */
-	u32 rxq0_operation_mode;		/* 0x1140 */
-	u32 unused_1144;			/* 0x1144 */
-	u32 rxq0_debug;				/* 0x1148 */
-};
-
-#define XGMAC_MTL_TXQ0_OPERATION_MODE_TQS_SHIFT		16
-#define XGMAC_MTL_TXQ0_OPERATION_MODE_TQS_MASK		GENMASK(8, 0)
-#define XGMAC_MTL_TXQ0_OPERATION_MODE_TXQEN_SHIFT	2
-#define XGMAC_MTL_TXQ0_OPERATION_MODE_TXQEN_ENABLED	2
-#define XGMAC_MTL_TXQ0_OPERATION_MODE_TSF		BIT(1)
-#define XGMAC_MTL_TXQ0_OPERATION_MODE_FTQ		BIT(0)
-
-#define XGMAC_MTL_TXQ0_DEBUG_TXQSTS			BIT(4)
-#define XGMAC_MTL_TXQ0_DEBUG_TRCSTS_SHIFT		1
-#define XGMAC_MTL_TXQ0_DEBUG_TRCSTS_MASK		GENMASK(2, 0)
-#define XGMAC_MTL_TXQ0_DEBUG_TRCSTS_READ_STATE		0x1
-
-#define XGMAC_MTL_RXQ0_OPERATION_MODE_RQS_SHIFT		16
-#define XGMAC_MTL_RXQ0_OPERATION_MODE_RQS_MASK		GENMASK(9, 0)
-#define XGMAC_MTL_RXQ0_OPERATION_MODE_EHFC		BIT(7)
-#define XGMAC_MTL_RXQ0_OPERATION_MODE_RSF		BIT(5)
-
-#define XGMAC_MTL_RXQ0_DEBUG_PRXQ_SHIFT			16
-#define XGMAC_MTL_RXQ0_DEBUG_PRXQ_MASK			GENMASK(14, 0)
-#define XGMAC_MTL_RXQ0_DEBUG_RXQSTS_SHIFT		4
-#define XGMAC_MTL_RXQ0_DEBUG_RXQSTS_MASK		GENMASK(1, 0)
-
-/* DMA Registers */
-
-#define XGMAC_DMA_REGS_BASE 0x3000
-
-struct xgmac_dma_regs {
-	u32 mode;					/* 0x3000 */
-	u32 sysbus_mode;				/* 0x3004 */
-	u32 unused_3008[(0x3100 - 0x3008) / 4];		/* 0x3008 */
-	u32 ch0_control;				/* 0x3100 */
-	u32 ch0_tx_control;				/* 0x3104 */
-	u32 ch0_rx_control;				/* 0x3108 */
-	u32 slot_func_control_status;			/* 0x310c */
-	u32 ch0_txdesc_list_haddress;			/* 0x3110 */
-	u32 ch0_txdesc_list_address;			/* 0x3114 */
-	u32 ch0_rxdesc_list_haddress;			/* 0x3118 */
-	u32 ch0_rxdesc_list_address;			/* 0x311c */
-	u32 unused_3120;				/* 0x3120 */
-	u32 ch0_txdesc_tail_pointer;			/* 0x3124 */
-	u32 unused_3128;				/* 0x3128 */
-	u32 ch0_rxdesc_tail_pointer;			/* 0x312c */
-	u32 ch0_txdesc_ring_length;			/* 0x3130 */
-	u32 ch0_rxdesc_ring_length;			/* 0x3134 */
-	u32 unused_3138[(0x3160 - 0x3138) / 4];		/* 0x3138 */
-	u32 ch0_status;					/* 0x3160 */
-};
-
-#define XGMAC_DMA_MODE_SWR				BIT(0)
-#define XGMAC_DMA_SYSBUS_MODE_WR_OSR_LMT_SHIFT		24
-#define XGMAC_DMA_SYSBUS_MODE_WR_OSR_LMT_MASK		GENMASK(4, 0)
-#define XGMAC_DMA_SYSBUS_MODE_RD_OSR_LMT_SHIFT		16
-#define XGMAC_DMA_SYSBUS_MODE_RD_OSR_LMT_MASK		GENMASK(4, 0)
-#define XGMAC_DMA_SYSBUS_MODE_AAL			BIT(12)
-#define XGMAC_DMA_SYSBUS_MODE_EAME			BIT(11)
-#define XGMAC_DMA_SYSBUS_MODE_BLEN32			BIT(4)
-#define XGMAC_DMA_SYSBUS_MODE_BLEN16			BIT(3)
-#define XGMAC_DMA_SYSBUS_MODE_BLEN8			BIT(2)
-#define XGMAC_DMA_SYSBUS_MODE_BLEN4			BIT(1)
-#define XGMAC_DMA_SYSBUS_MODE_UNDEF			BIT(0)
-
-#define XGMAC_DMA_CH0_CONTROL_DSL_SHIFT			18
-#define XGMAC_DMA_CH0_CONTROL_PBLX8			BIT(16)
-
-#define XGMAC_DMA_CH0_TX_CONTROL_TXPBL_SHIFT		16
-#define XGMAC_DMA_CH0_TX_CONTROL_TXPBL_MASK		GENMASK(5, 0)
-#define XGMAC_DMA_CH0_TX_CONTROL_OSP			BIT(4)
-#define XGMAC_DMA_CH0_TX_CONTROL_ST			BIT(0)
-
-#define XGMAC_DMA_CH0_RX_CONTROL_RXPBL_SHIFT		16
-#define XGMAC_DMA_CH0_RX_CONTROL_RXPBL_MASK		GENMASK(5, 0)
-#define XGMAC_DMA_CH0_RX_CONTROL_RBSZ_SHIFT		4
-#define XGMAC_DMA_CH0_RX_CONTROL_RBSZ_MASK		GENMASK(10, 0)
-#define XGMAC_DMA_CH0_RX_CONTROL_SR			BIT(0)
-
-/* Descriptors */
-#define XGMAC_DESCRIPTORS_TX		8
-#define XGMAC_DESCRIPTORS_RX		8
-#define XGMAC_BUFFER_ALIGN		ARCH_DMA_MINALIGN
-#define XGMAC_MAX_PACKET_SIZE		ALIGN(1568, ARCH_DMA_MINALIGN)
-#define XGMAC_RX_BUFFER_SIZE		(XGMAC_DESCRIPTORS_RX * XGMAC_MAX_PACKET_SIZE)
-
-#define XGMAC_RDES3_PKT_LENGTH_MASK	GENMASK(13, 0)
-
-struct xgmac_desc {
-	u32 des0;
-	u32 des1;
-	u32 des2;
-	u32 des3;
-};
-
-#define XGMAC_DESC3_OWN		BIT(31)
-#define XGMAC_DESC3_FD		BIT(29)
-#define XGMAC_DESC3_LD		BIT(28)
-
-#define XGMAC_AXI_WIDTH_32	4
-#define XGMAC_AXI_WIDTH_64	8
-#define XGMAC_AXI_WIDTH_128	16
-
-struct xgmac_config {
-	bool reg_access_always_ok;
-	int swr_wait;
-	int config_mac;
-	int config_mac_mdio;
-	unsigned int axi_bus_width;
-	phy_interface_t (*interface)(const struct udevice *dev);
-	struct xgmac_ops *ops;
-};
-
-struct xgmac_ops {
-	void (*xgmac_inval_desc)(void *desc);
-	void (*xgmac_flush_desc)(void *desc);
-	void (*xgmac_inval_buffer)(void *buf, size_t size);
-	void (*xgmac_flush_buffer)(void *buf, size_t size);
-	int (*xgmac_probe_resources)(struct udevice *dev);
-	int (*xgmac_remove_resources)(struct udevice *dev);
-	int (*xgmac_stop_resets)(struct udevice *dev);
-	int (*xgmac_start_resets)(struct udevice *dev);
-	int (*xgmac_stop_clks)(struct udevice *dev);
-	int (*xgmac_start_clks)(struct udevice *dev);
-	int (*xgmac_calibrate_pads)(struct udevice *dev);
-	int (*xgmac_disable_calibration)(struct udevice *dev);
-	int (*xgmac_get_enetaddr)(struct udevice *dev);
-};
-
-struct xgmac_priv {
-	struct udevice *dev;
-	const struct xgmac_config *config;
-	fdt_addr_t regs;
-	struct xgmac_mac_regs *mac_regs;
-	struct xgmac_mtl_regs *mtl_regs;
-	struct xgmac_dma_regs *dma_regs;
-	struct reset_ctl reset_ctl;
-	struct reset_ctl_bulk reset_bulk;
-	struct clk clk_common;
-	struct mii_dev *mii;
-	struct phy_device *phy;
-	ofnode phy_of_node;
-	void *syscon_phy;
-	u32 syscon_phy_regshift;
-	u32 max_speed;
-	void *tx_descs;
-	void *rx_descs;
-	int tx_desc_idx, rx_desc_idx;
-	unsigned int desc_size;
-	unsigned int desc_per_cacheline;
-	void *tx_dma_buf;
-	void *rx_dma_buf;
-	void *rx_pkt;
-	bool started;
-	bool reg_access_ok;
-	bool clk_ck_enabled;
-};
-
-void xgmac_inval_desc_generic(void *desc);
-void xgmac_flush_desc_generic(void *desc);
-void xgmac_inval_buffer_generic(void *buf, size_t size);
-void xgmac_flush_buffer_generic(void *buf, size_t size);
-int xgmac_null_ops(struct udevice *dev);
-
-extern struct xgmac_config xgmac_socfpga_config;
diff --git a/drivers/net/dwc_eth_xgmac_socfpga.c b/drivers/net/dwc_eth_xgmac_socfpga.c
deleted file mode 100644
index 270c1b0ca6c..00000000000
--- a/drivers/net/dwc_eth_xgmac_socfpga.c
+++ /dev/null
@@ -1,226 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (c) 2023, Intel Corporation
- */
-#include <clk.h>
-#include <cpu_func.h>
-#include <dm.h>
-#include <errno.h>
-#include <eth_phy.h>
-#include <log.h>
-#include <malloc.h>
-#include <memalign.h>
-#include <miiphy.h>
-#include <net.h>
-#include <netdev.h>
-#include <phy.h>
-#include <reset.h>
-#include <wait_bit.h>
-#include <asm/arch/secure_reg_helper.h>
-#include <asm/arch/system_manager.h>
-#include <regmap.h>
-#include <syscon.h>
-#include <asm/cache.h>
-#include <asm/gpio.h>
-#include <asm/io.h>
-#include <linux/delay.h>
-#include <dm/device_compat.h>
-#include "dwc_eth_xgmac.h"
-
-#define SOCFPGA_XGMAC_SYSCON_ARG_COUNT 2
-
-static int dwxgmac_socfpga_do_setphy(struct udevice *dev, u32 modereg)
-{
-	struct xgmac_priv *xgmac = dev_get_priv(dev);
-	int ret;
-
-	u32 modemask = SYSMGR_EMACGRP_CTRL_PHYSEL_MASK <<
-		       xgmac->syscon_phy_regshift;
-
-	if (!(IS_ENABLED(CONFIG_SPL_BUILD)) && IS_ENABLED(CONFIG_SPL_ATF)) {
-		u32 index = ((u64)xgmac->syscon_phy - socfpga_get_sysmgr_addr() -
-			     SYSMGR_SOC64_EMAC0) >> 2;
-
-		u32 id = SOCFPGA_SECURE_REG_SYSMGR_SOC64_EMAC0 + index;
-
-		ret = socfpga_secure_reg_update32(id,
-						  modemask,
-						  modereg <<
-						  xgmac->syscon_phy_regshift);
-		if (ret) {
-			dev_err(dev, "Failed to set PHY register via SMC call\n");
-			return ret;
-		}
-
-	} else {
-		clrsetbits_le32(xgmac->phy, modemask, modereg);
-	}
-
-	return 0;
-}
-
-static int xgmac_probe_resources_socfpga(struct udevice *dev)
-{
-	struct xgmac_priv *xgmac = dev_get_priv(dev);
-	struct regmap *reg_map;
-	struct ofnode_phandle_args args;
-	void *range;
-	phy_interface_t interface;
-	int ret;
-	u32 modereg;
-
-	interface = xgmac->config->interface(dev);
-
-	switch (interface) {
-	case PHY_INTERFACE_MODE_MII:
-	case PHY_INTERFACE_MODE_GMII:
-		modereg = SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_GMII_MII;
-		break;
-	case PHY_INTERFACE_MODE_RMII:
-		modereg = SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_RMII;
-		break;
-	case PHY_INTERFACE_MODE_RGMII:
-		modereg = SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_RGMII;
-		break;
-	default:
-		dev_err(dev, "Unsupported PHY mode\n");
-		return -EINVAL;
-	}
-
-	/* Get PHY syscon */
-	ret = dev_read_phandle_with_args(dev, "altr,sysmgr-syscon", NULL,
-					 SOCFPGA_XGMAC_SYSCON_ARG_COUNT,
-					 0, &args);
-
-	if (ret) {
-		dev_err(dev, "Failed to get syscon: %d\n", ret);
-		return ret;
-	}
-
-	if (args.args_count != SOCFPGA_XGMAC_SYSCON_ARG_COUNT) {
-		dev_err(dev, "Invalid number of syscon args\n");
-		return -EINVAL;
-	}
-
-	reg_map = syscon_node_to_regmap(args.node);
-	if (IS_ERR(reg_map)) {
-		ret = PTR_ERR(reg_map);
-		dev_err(dev, "Failed to get reg_map: %d\n", ret);
-		return ret;
-	}
-
-	range = regmap_get_range(reg_map, 0);
-	if (!range) {
-		dev_err(dev, "Failed to get reg_map: %d\n", ret);
-		return -ENOMEM;
-	}
-
-	xgmac->syscon_phy = range + args.args[0];
-	xgmac->syscon_phy_regshift = args.args[1];
-
-	/* Get Reset Bulk */
-	ret = reset_get_bulk(dev, &xgmac->reset_bulk);
-	if (ret) {
-		dev_err(dev, "Failed to get reset: %d\n", ret);
-		return ret;
-	}
-
-	ret = reset_assert_bulk(&xgmac->reset_bulk);
-	if (ret) {
-		dev_err(dev, "XGMAC failed to assert reset: %d\n", ret);
-		return ret;
-	}
-
-	ret = dwxgmac_socfpga_do_setphy(dev, modereg);
-	if (ret)
-		return ret;
-
-	ret = reset_deassert_bulk(&xgmac->reset_bulk);
-	if (ret) {
-		dev_err(dev, "XGMAC failed to de-assert reset: %d\n", ret);
-		return ret;
-	}
-
-	ret = clk_get_by_name(dev, "stmmaceth", &xgmac->clk_common);
-	if (ret) {
-		pr_err("clk_get_by_name(stmmaceth) failed: %d", ret);
-		goto err_probe;
-	}
-	return 0;
-
-err_probe:
-	debug("%s: returns %d\n", __func__, ret);
-	return ret;
-}
-
-static int xgmac_get_enetaddr_socfpga(struct udevice *dev)
-{
-	struct eth_pdata *pdata = dev_get_plat(dev);
-	struct xgmac_priv *xgmac = dev_get_priv(dev);
-	u32 hi_addr, lo_addr;
-
-	debug("%s(dev=%p):\n", __func__, dev);
-
-	/* Read the MAC Address from the hardawre */
-	hi_addr	= readl(&xgmac->mac_regs->address0_high);
-	lo_addr	= readl(&xgmac->mac_regs->address0_low);
-
-	pdata->enetaddr[0] = lo_addr & 0xff;
-	pdata->enetaddr[1] = (lo_addr >> 8) & 0xff;
-	pdata->enetaddr[2] = (lo_addr >> 16) & 0xff;
-	pdata->enetaddr[3] = (lo_addr >> 24) & 0xff;
-	pdata->enetaddr[4] = hi_addr & 0xff;
-	pdata->enetaddr[5] = (hi_addr >> 8) & 0xff;
-
-	return !is_valid_ethaddr(pdata->enetaddr);
-}
-
-static int xgmac_start_resets_socfpga(struct udevice *dev)
-{
-	struct xgmac_priv *xgmac = dev_get_priv(dev);
-	int ret;
-
-	debug("%s(dev=%p):\n", __func__, dev);
-
-	ret = reset_assert_bulk(&xgmac->reset_bulk);
-	if (ret < 0) {
-		pr_err("xgmac reset assert failed: %d", ret);
-		return ret;
-	}
-
-	udelay(2);
-
-	ret = reset_deassert_bulk(&xgmac->reset_bulk);
-	if (ret < 0) {
-		pr_err("xgmac reset de-assert failed: %d", ret);
-		return ret;
-	}
-
-	return 0;
-}
-
-static struct xgmac_ops xgmac_socfpga_ops = {
-	.xgmac_inval_desc = xgmac_inval_desc_generic,
-	.xgmac_flush_desc = xgmac_flush_desc_generic,
-	.xgmac_inval_buffer = xgmac_inval_buffer_generic,
-	.xgmac_flush_buffer = xgmac_flush_buffer_generic,
-	.xgmac_probe_resources = xgmac_probe_resources_socfpga,
-	.xgmac_remove_resources = xgmac_null_ops,
-	.xgmac_stop_resets = xgmac_null_ops,
-	.xgmac_start_resets = xgmac_start_resets_socfpga,
-	.xgmac_stop_clks = xgmac_null_ops,
-	.xgmac_start_clks = xgmac_null_ops,
-	.xgmac_calibrate_pads = xgmac_null_ops,
-	.xgmac_disable_calibration = xgmac_null_ops,
-	.xgmac_get_enetaddr = xgmac_get_enetaddr_socfpga,
-};
-
-struct xgmac_config __maybe_unused xgmac_socfpga_config = {
-	.reg_access_always_ok = false,
-	.swr_wait = 50,
-	.config_mac = XGMAC_MAC_RXQ_CTRL0_RXQ0EN_ENABLED_DCB,
-	.config_mac_mdio = XGMAC_MAC_MDIO_ADDRESS_CR_350_400,
-	.axi_bus_width = XGMAC_AXI_WIDTH_64,
-	.interface = dev_read_phy_mode,
-	.ops = &xgmac_socfpga_ops
-};
diff --git a/drivers/net/dwmac_meson8b.c b/drivers/net/dwmac_meson8b.c
index fde4aabbace..871171e1be5 100644
--- a/drivers/net/dwmac_meson8b.c
+++ b/drivers/net/dwmac_meson8b.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2021 BayLibre, SAS
  */
 
+#include <common.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <phy.h>
diff --git a/drivers/net/dwmac_s700.c b/drivers/net/dwmac_s700.c
index 969d247b4f3..744b58bdd1a 100644
--- a/drivers/net/dwmac_s700.c
+++ b/drivers/net/dwmac_s700.c
@@ -5,6 +5,7 @@
  * Actions DWMAC specific glue layer
  */
 
+#include <common.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <dm.h>
diff --git a/drivers/net/dwmac_socfpga.c b/drivers/net/dwmac_socfpga.c
index bba3fc4d34b..82fdff51dac 100644
--- a/drivers/net/dwmac_socfpga.c
+++ b/drivers/net/dwmac_socfpga.c
@@ -5,6 +5,7 @@
  * Altera SoCFPGA EMAC extras
  */
 
+#include <common.h>
 #include <asm/arch/secure_reg_helper.h>
 #include <asm/arch/system_manager.h>
 #include <asm/io.h>
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 663d900eb09..4e7ba666770 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -29,6 +29,7 @@ tested on both gig copper and gig fiber boards
  *  Copyright 2011 Freescale Semiconductor, Inc.
  */
 
+#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <dm.h>
diff --git a/drivers/net/e1000_spi.c b/drivers/net/e1000_spi.c
index 1e830b99f1d..69adf282c73 100644
--- a/drivers/net/e1000_spi.c
+++ b/drivers/net/e1000_spi.c
@@ -1,9 +1,9 @@
+#include <common.h>
 #include <command.h>
 #include <console.h>
 #include <linux/delay.h>
 #include "e1000.h"
 #include <malloc.h>
-#include <vsprintf.h>
 #include <linux/compiler.h>
 
 /*-----------------------------------------------------------------------
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index d18a8d577ca..38d96ab72b6 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -4,7 +4,7 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <config.h>
+#include <common.h>
 #include <asm/io.h>
 #include <cpu_func.h>
 #include <malloc.h>
diff --git a/drivers/net/eth-phy-uclass.c b/drivers/net/eth-phy-uclass.c
index 1dae26878e6..9d1e8d38ffa 100644
--- a/drivers/net/eth-phy-uclass.c
+++ b/drivers/net/eth-phy-uclass.c
@@ -5,6 +5,7 @@
 
 #define LOG_CATEGORY UCLASS_ETH_PHY
 
+#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <net.h>
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index dc7e6f1929f..13fad8119bb 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -9,6 +9,7 @@
  * Copyright (C) 2016 Cadence Design Systems Inc.
  */
 
+#include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index 0a0d92bc2cd..90af18f80a8 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -7,6 +7,7 @@
  * (C) Copyright 2007 Pengutronix, Juergen Beisert <[email protected]>
  */
 
+#include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <env.h>
diff --git a/drivers/net/fm/b4860.c b/drivers/net/fm/b4860.c
index 46a0d38b101..1c5543e3c87 100644
--- a/drivers/net/fm/b4860.c
+++ b/drivers/net/fm/b4860.c
@@ -3,7 +3,7 @@
  * Copyright 2012 Freescale Semiconductor, Inc.
  *	Roy Zang <[email protected]>
  */
-#include <config.h>
+#include <common.h>
 #include <env.h>
 #include <phy.h>
 #include <fm_eth.h>
diff --git a/drivers/net/fm/dtsec.c b/drivers/net/fm/dtsec.c
index 371d9f07a46..c51a65cb94f 100644
--- a/drivers/net/fm/dtsec.c
+++ b/drivers/net/fm/dtsec.c
@@ -3,6 +3,7 @@
  * Copyright 2009-2011 Freescale Semiconductor, Inc.
  */
 
+#include <common.h>
 #include <asm/types.h>
 #include <asm/io.h>
 #include <fsl_dtsec.h>
diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c
index 19f3f0fef07..9fd26de0d72 100644
--- a/drivers/net/fm/eth.c
+++ b/drivers/net/fm/eth.c
@@ -4,7 +4,7 @@
  * Copyright 2020 NXP
  *	Dave Liu <[email protected]>
  */
-#include <config.h>
+#include <common.h>
 #include <log.h>
 #include <part.h>
 #include <asm/io.h>
diff --git a/drivers/net/fm/ls1043.c b/drivers/net/fm/ls1043.c
index 41b75761fdd..3db5c907a2a 100644
--- a/drivers/net/fm/ls1043.c
+++ b/drivers/net/fm/ls1043.c
@@ -2,7 +2,7 @@
 /*
  * Copyright 2015 Freescale Semiconductor, Inc.
  */
-#include <config.h>
+#include <common.h>
 #include <phy.h>
 #include <fm_eth.h>
 #include <asm/io.h>
diff --git a/drivers/net/fm/ls1046.c b/drivers/net/fm/ls1046.c
index 56c5c6846a4..3b0ee98ddd3 100644
--- a/drivers/net/fm/ls1046.c
+++ b/drivers/net/fm/ls1046.c
@@ -2,7 +2,7 @@
 /*
  * Copyright 2016 Freescale Semiconductor, Inc.
  */
-#include <config.h>
+#include <common.h>
 #include <phy.h>
 #include <fm_eth.h>
 #include <asm/io.h>
diff --git a/drivers/net/fm/memac.c b/drivers/net/fm/memac.c
index 37b54626af0..eeb67a39a77 100644
--- a/drivers/net/fm/memac.c
+++ b/drivers/net/fm/memac.c
@@ -7,6 +7,7 @@
 /* MAXFRM - maximum frame length */
 #define MAXFRM_MASK	0x0000ffff
 
+#include <common.h>
 #include <log.h>
 #include <phy.h>
 #include <asm/types.h>
diff --git a/drivers/net/fm/memac_phy.c b/drivers/net/fm/memac_phy.c
index 26425d94ae5..e0b62b94490 100644
--- a/drivers/net/fm/memac_phy.c
+++ b/drivers/net/fm/memac_phy.c
@@ -5,6 +5,7 @@
  *	Roy Zang <[email protected]>
  * Some part is taken from tsec.c
  */
+#include <common.h>
 #include <miiphy.h>
 #include <phy.h>
 #include <asm/io.h>
diff --git a/drivers/net/fm/p1023.c b/drivers/net/fm/p1023.c
index 362bc9f30a1..9013b276bc9 100644
--- a/drivers/net/fm/p1023.c
+++ b/drivers/net/fm/p1023.c
@@ -2,7 +2,7 @@
 /*
  * Copyright 2011 Freescale Semiconductor, Inc.
  */
-#include <config.h>
+#include <common.h>
 #include <phy.h>
 #include <fm_eth.h>
 #include <asm/io.h>
diff --git a/drivers/net/fm/p4080.c b/drivers/net/fm/p4080.c
index 6e63e338e5d..7ad993221f7 100644
--- a/drivers/net/fm/p4080.c
+++ b/drivers/net/fm/p4080.c
@@ -2,7 +2,7 @@
 /*
  * Copyright 2011 Freescale Semiconductor, Inc.
  */
-#include <config.h>
+#include <common.h>
 #include <phy.h>
 #include <fm_eth.h>
 #include <asm/io.h>
diff --git a/drivers/net/fm/p5020.c b/drivers/net/fm/p5020.c
index 4fc1f723a3d..f931491b112 100644
--- a/drivers/net/fm/p5020.c
+++ b/drivers/net/fm/p5020.c
@@ -2,7 +2,7 @@
 /*
  * Copyright 2011 Freescale Semiconductor, Inc.
  */
-#include <config.h>
+#include <common.h>
 #include <phy.h>
 #include <fm_eth.h>
 #include <asm/io.h>
diff --git a/drivers/net/fm/p5040.c b/drivers/net/fm/p5040.c
index f6ae947ef99..ef9f4bcce4d 100644
--- a/drivers/net/fm/p5040.c
+++ b/drivers/net/fm/p5040.c
@@ -2,7 +2,7 @@
 /*
  * Copyright 2011 Freescale Semiconductor, Inc.
  */
-#include <config.h>
+#include <common.h>
 #include <phy.h>
 #include <fm_eth.h>
 #include <asm/io.h>
diff --git a/drivers/net/fm/t1024.c b/drivers/net/fm/t1024.c
index 18d71e7b60e..70ab4610cdf 100644
--- a/drivers/net/fm/t1024.c
+++ b/drivers/net/fm/t1024.c
@@ -4,7 +4,7 @@
  * Shengzhou Liu <[email protected]>
  */
 
-#include <config.h>
+#include <common.h>
 #include <phy.h>
 #include <fm_eth.h>
 #include <asm/immap_85xx.h>
diff --git a/drivers/net/fm/t1040.c b/drivers/net/fm/t1040.c
index dafa6d638e3..5c260bed7fd 100644
--- a/drivers/net/fm/t1040.c
+++ b/drivers/net/fm/t1040.c
@@ -2,7 +2,7 @@
 /*
  * Copyright 2013 Freescale Semiconductor, Inc.
  */
-#include <config.h>
+#include <common.h>
 #include <phy.h>
 #include <fm_eth.h>
 #include <asm/io.h>
diff --git a/drivers/net/fm/t2080.c b/drivers/net/fm/t2080.c
index 390ca0aee70..6174934d2b8 100644
--- a/drivers/net/fm/t2080.c
+++ b/drivers/net/fm/t2080.c
@@ -5,7 +5,7 @@
  * Shengzhou Liu <[email protected]>
  */
 
-#include <config.h>
+#include <common.h>
 #include <phy.h>
 #include <fm_eth.h>
 #include <asm/immap_85xx.h>
diff --git a/drivers/net/fm/t4240.c b/drivers/net/fm/t4240.c
index df76073eecd..f0a02bfe457 100644
--- a/drivers/net/fm/t4240.c
+++ b/drivers/net/fm/t4240.c
@@ -3,7 +3,7 @@
  * Copyright 2012 Freescale Semiconductor, Inc.
  *	Roy Zang <[email protected]>
  */
-#include <config.h>
+#include <common.h>
 #include <phy.h>
 #include <fm_eth.h>
 #include <asm/io.h>
diff --git a/drivers/net/fm/tgec.c b/drivers/net/fm/tgec.c
index f7b51ce0bba..9cc9f3fde3a 100644
--- a/drivers/net/fm/tgec.c
+++ b/drivers/net/fm/tgec.c
@@ -7,6 +7,7 @@
 /* MAXFRM - maximum frame length */
 #define MAXFRM_MASK	0x0000ffff
 
+#include <common.h>
 #include <phy.h>
 #include <asm/types.h>
 #include <asm/io.h>
diff --git a/drivers/net/fm/tgec_phy.c b/drivers/net/fm/tgec_phy.c
index f6c8f80c835..22225c2f82f 100644
--- a/drivers/net/fm/tgec_phy.c
+++ b/drivers/net/fm/tgec_phy.c
@@ -4,6 +4,7 @@
  *	Andy Fleming <[email protected]>
  * Some part is taken from tsec.c
  */
+#include <common.h>
 #include <miiphy.h>
 #include <phy.h>
 #include <asm/io.h>
diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c
index c2869ce4010..f5c5057bec1 100644
--- a/drivers/net/fsl-mc/mc.c
+++ b/drivers/net/fsl-mc/mc.c
@@ -3,7 +3,7 @@
  * Copyright 2014 Freescale Semiconductor, Inc.
  * Copyright 2017-2018, 2020-2021 NXP
  */
-#include <config.h>
+#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <env.h>
diff --git a/drivers/net/fsl-mc/mc_sys.c b/drivers/net/fsl-mc/mc_sys.c
index 482fb0463d5..4d32516b005 100644
--- a/drivers/net/fsl-mc/mc_sys.c
+++ b/drivers/net/fsl-mc/mc_sys.c
@@ -8,6 +8,7 @@
 
 #include <fsl-mc/fsl_mc_sys.h>
 #include <fsl-mc/fsl_mc_cmd.h>
+#include <common.h>
 #include <errno.h>
 #include <asm/io.h>
 #include <linux/delay.h>
diff --git a/drivers/net/fsl_enetc.c b/drivers/net/fsl_enetc.c
index a6b0bafc8c6..1fd5089cc4b 100644
--- a/drivers/net/fsl_enetc.c
+++ b/drivers/net/fsl_enetc.c
@@ -4,6 +4,7 @@
  * Copyright 2017-2021 NXP
  */
 
+#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <fdt_support.h>
diff --git a/drivers/net/fsl_enetc_mdio.c b/drivers/net/fsl_enetc_mdio.c
index 2d5fcbb6dbd..50ad76dfeb5 100644
--- a/drivers/net/fsl_enetc_mdio.c
+++ b/drivers/net/fsl_enetc_mdio.c
@@ -4,6 +4,7 @@
  * Copyright 2019 NXP
  */
 
+#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <pci.h>
diff --git a/drivers/net/fsl_ls_mdio.c b/drivers/net/fsl_ls_mdio.c
index e3c37d9045f..fce73937502 100644
--- a/drivers/net/fsl_ls_mdio.c
+++ b/drivers/net/fsl_ls_mdio.c
@@ -3,6 +3,7 @@
  * Copyright 2020 NXP
  */
 
+#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <miiphy.h>
diff --git a/drivers/net/fsl_mdio.c b/drivers/net/fsl_mdio.c
index a0f1c59e058..5fd11db05f5 100644
--- a/drivers/net/fsl_mdio.c
+++ b/drivers/net/fsl_mdio.c
@@ -5,6 +5,7 @@
  *	Mingkai Hu <[email protected]>
  */
 
+#include <common.h>
 #include <miiphy.h>
 #include <phy.h>
 #include <fsl_mdio.h>
diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c
index 8781e50a48d..9b536fd5ab8 100644
--- a/drivers/net/ftgmac100.c
+++ b/drivers/net/ftgmac100.c
@@ -11,6 +11,7 @@
  * Copyright (C) 2018, IBM Corporation.
  */
 
+#include <common.h>
 #include <clk.h>
 #include <reset.h>
 #include <cpu_func.h>
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index 199a0723b84..fae3adc3de3 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -7,6 +7,7 @@
  */
 
 #include <config.h>
+#include <common.h>
 #include <cpu_func.h>
 #include <env.h>
 #include <malloc.h>
diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c
index d63e2dbfaeb..51f835adabc 100644
--- a/drivers/net/gmac_rockchip.c
+++ b/drivers/net/gmac_rockchip.c
@@ -5,6 +5,7 @@
  * Rockchip GMAC ethernet IP driver for U-Boot
  */
 
+#include <common.h>
 #include <dm.h>
 #include <clk.h>
 #include <log.h>
diff --git a/drivers/net/higmacv300.c b/drivers/net/higmacv300.c
index 6b88f6fbf59..1862235d0cd 100644
--- a/drivers/net/higmacv300.c
+++ b/drivers/net/higmacv300.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <asm/cache.h>
 #include <asm/io.h>
+#include <common.h>
 #include <console.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c
index cc2e826257a..518548e3bbc 100644
--- a/drivers/net/ks8851_mll.c
+++ b/drivers/net/ks8851_mll.c
@@ -6,6 +6,7 @@
 
 #include <log.h>
 #include <asm/io.h>
+#include <common.h>
 #include <command.h>
 #include <malloc.h>
 #include <net.h>
diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c
index b72198ca530..87fbada06ba 100644
--- a/drivers/net/ldpaa_eth/ldpaa_eth.c
+++ b/drivers/net/ldpaa_eth/ldpaa_eth.c
@@ -4,6 +4,7 @@
  * Copyright 2017, 2023 NXP
  */
 
+#include <common.h>
 #include <cpu_func.h>
 #include <dm/device_compat.h>
 #include <fsl-mc/fsl_dpmac.h>
diff --git a/drivers/net/ldpaa_eth/ldpaa_wriop.c b/drivers/net/ldpaa_eth/ldpaa_wriop.c
index a803b8fa797..adecb813576 100644
--- a/drivers/net/ldpaa_eth/ldpaa_wriop.c
+++ b/drivers/net/ldpaa_eth/ldpaa_wriop.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2015 Freescale Semiconductor
  */
 
+#include <common.h>
 #include <asm/io.h>
 #include <asm/types.h>
 #include <malloc.h>
diff --git a/drivers/net/ldpaa_eth/ls1088a.c b/drivers/net/ldpaa_eth/ls1088a.c
index 2727fb01179..32bcb51725a 100644
--- a/drivers/net/ldpaa_eth/ls1088a.c
+++ b/drivers/net/ldpaa_eth/ls1088a.c
@@ -2,7 +2,7 @@
 /*
  * Copyright 2017 NXP
  */
-#include <config.h>
+#include <common.h>
 #include <phy.h>
 #include <fsl-mc/ldpaa_wriop.h>
 #include <asm/io.h>
diff --git a/drivers/net/ldpaa_eth/ls2080a.c b/drivers/net/ldpaa_eth/ls2080a.c
index 05017552b3f..845a36bce87 100644
--- a/drivers/net/ldpaa_eth/ls2080a.c
+++ b/drivers/net/ldpaa_eth/ls2080a.c
@@ -2,7 +2,7 @@
 /*
  * Copyright 2015 Freescale Semiconductor, Inc.
  */
-#include <config.h>
+#include <common.h>
 #include <phy.h>
 #include <fsl-mc/ldpaa_wriop.h>
 #include <asm/io.h>
diff --git a/drivers/net/ldpaa_eth/lx2160a.c b/drivers/net/ldpaa_eth/lx2160a.c
index 25ae684063b..c2641a92d7e 100644
--- a/drivers/net/ldpaa_eth/lx2160a.c
+++ b/drivers/net/ldpaa_eth/lx2160a.c
@@ -2,7 +2,7 @@
 /*
  * Copyright 2018, 2020 NXP
  */
-#include <config.h>
+#include <common.h>
 #include <phy.h>
 #include <fsl-mc/ldpaa_wriop.h>
 #include <asm/io.h>
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index cbf5f605518..bca014c3cbb 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -2,6 +2,7 @@
 /*
  * Copyright (C) 2005-2006 Atmel Corporation
  */
+#include <common.h>
 #include <clk.h>
 #include <cpu_func.h>
 #include <dm.h>
diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c
index 04b711e4f65..ec1fae9688b 100644
--- a/drivers/net/mcffec.c
+++ b/drivers/net/mcffec.c
@@ -10,7 +10,7 @@
  * (C) 2019 Angelo Dureghello <[email protected]>
  */
 
-#include <config.h>
+#include <common.h>
 #include <env.h>
 #include <hang.h>
 #include <malloc.h>
diff --git a/drivers/net/mcfmii.c b/drivers/net/mcfmii.c
index 9bf887035d7..eae20654513 100644
--- a/drivers/net/mcfmii.c
+++ b/drivers/net/mcfmii.c
@@ -4,6 +4,7 @@
  * TsiChung Liew ([email protected])
  */
 
+#include <common.h>
 #include <config.h>
 #include <net.h>
 #include <netdev.h>
diff --git a/drivers/net/mdio-ipq4019.c b/drivers/net/mdio-ipq4019.c
index c824c3da3dd..50134b4d9b6 100644
--- a/drivers/net/mdio-ipq4019.c
+++ b/drivers/net/mdio-ipq4019.c
@@ -11,6 +11,7 @@
  */
 
 #include <asm/io.h>
+#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <linux/bitops.h>
diff --git a/drivers/net/mpc8xx_fec.c b/drivers/net/mpc8xx_fec.c
index c44fa6acdd7..78337731e1f 100644
--- a/drivers/net/mpc8xx_fec.c
+++ b/drivers/net/mpc8xx_fec.c
@@ -4,6 +4,7 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
+#include <common.h>
 #include <command.h>
 #include <hang.h>
 #include <malloc.h>
diff --git a/drivers/net/mscc_eswitch/jr2_switch.c b/drivers/net/mscc_eswitch/jr2_switch.c
index 925888e0765..7157428a685 100644
--- a/drivers/net/mscc_eswitch/jr2_switch.c
+++ b/drivers/net/mscc_eswitch/jr2_switch.c
@@ -3,6 +3,7 @@
  * Copyright (c) 2018 Microsemi Corporation
  */
 
+#include <common.h>
 #include <config.h>
 #include <dm.h>
 #include <malloc.h>
diff --git a/drivers/net/mscc_eswitch/luton_switch.c b/drivers/net/mscc_eswitch/luton_switch.c
index 2f3d0911fdf..5e4f00c4f4d 100644
--- a/drivers/net/mscc_eswitch/luton_switch.c
+++ b/drivers/net/mscc_eswitch/luton_switch.c
@@ -3,6 +3,7 @@
  * Copyright (c) 2019 Microsemi Corporation
  */
 
+#include <common.h>
 #include <config.h>
 #include <dm.h>
 #include <malloc.h>
diff --git a/drivers/net/mscc_eswitch/ocelot_switch.c b/drivers/net/mscc_eswitch/ocelot_switch.c
index 30bb4b5bad8..7ea1f551a11 100644
--- a/drivers/net/mscc_eswitch/ocelot_switch.c
+++ b/drivers/net/mscc_eswitch/ocelot_switch.c
@@ -3,6 +3,7 @@
  * Copyright (c) 2018 Microsemi Corporation
  */
 
+#include <common.h>
 #include <config.h>
 #include <dm.h>
 #include <log.h>
diff --git a/drivers/net/mscc_eswitch/serval_switch.c b/drivers/net/mscc_eswitch/serval_switch.c
index 8eab41df99a..be06e483373 100644
--- a/drivers/net/mscc_eswitch/serval_switch.c
+++ b/drivers/net/mscc_eswitch/serval_switch.c
@@ -3,6 +3,7 @@
  * Copyright (c) 2019 Microsemi Corporation
  */
 
+#include <common.h>
 #include <config.h>
 #include <dm.h>
 #include <log.h>
diff --git a/drivers/net/mscc_eswitch/servalt_switch.c b/drivers/net/mscc_eswitch/servalt_switch.c
index 61547d7933e..2d2329c204a 100644
--- a/drivers/net/mscc_eswitch/servalt_switch.c
+++ b/drivers/net/mscc_eswitch/servalt_switch.c
@@ -3,6 +3,7 @@
  * Copyright (c) 2019 Microsemi Corporation
  */
 
+#include <common.h>
 #include <config.h>
 #include <dm.h>
 #include <malloc.h>
diff --git a/drivers/net/mt7628-eth.c b/drivers/net/mt7628-eth.c
index fc8a6bb331b..b95de474fb0 100644
--- a/drivers/net/mt7628-eth.c
+++ b/drivers/net/mt7628-eth.c
@@ -13,6 +13,7 @@
  * copyrights here, so I can't add them here.
  */
 
+#include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
diff --git a/drivers/net/mtk_eth.c b/drivers/net/mtk_eth.c
index 94f17a97fe0..75e7bcf83b7 100644
--- a/drivers/net/mtk_eth.c
+++ b/drivers/net/mtk_eth.c
@@ -6,6 +6,7 @@
  * Author: Mark Lee <[email protected]>
  */
 
+#include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
diff --git a/drivers/net/mv88e6xxx.c b/drivers/net/mv88e6xxx.c
index 557b6b2c8f6..8fbbc1cacca 100644
--- a/drivers/net/mv88e6xxx.c
+++ b/drivers/net/mv88e6xxx.c
@@ -23,6 +23,7 @@
  * on the mv88e6176 via an SGMII interface.
  */
 
+#include <common.h>
 #include <dm/device.h>
 #include <dm/device_compat.h>
 #include <dm/device-internal.h>
diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index 17b62bbc205..3587ca2124e 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -11,6 +11,7 @@
  * Copyright (C) 2002 [email protected]
  */
 
+#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <net.h>
diff --git a/drivers/net/mvmdio.c b/drivers/net/mvmdio.c
index 3315e06f591..5ebcfe14b7f 100644
--- a/drivers/net/mvmdio.c
+++ b/drivers/net/mvmdio.c
@@ -4,6 +4,7 @@
  * Author: Ken Ma<[email protected]>
  */
 
+#include <common.h>
 #include <dm.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
index f014d39b175..24933473fa0 100644
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -12,6 +12,7 @@
  * Thomas Petazzoni <[email protected]>
  */
 
+#include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c
index d19a79d1600..1cd54307650 100644
--- a/drivers/net/mvpp2.c
+++ b/drivers/net/mvpp2.c
@@ -13,6 +13,7 @@
  * warranty of any kind, whether express or implied.
  */
 
+#include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <asm/cache.h>
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index 1943de8ba73..151bc55e076 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -4,12 +4,12 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
+#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <log.h>
 #include <stdio_dev.h>
 #include <net.h>
-#include <vsprintf.h>
 
 #ifndef CFG_NETCONSOLE_BUFFER_SIZE
 #define CFG_NETCONSOLE_BUFFER_SIZE 512
diff --git a/drivers/net/npcm750_eth.c b/drivers/net/npcm750_eth.c
index f0ec6c556cc..2028f4ae286 100644
--- a/drivers/net/npcm750_eth.c
+++ b/drivers/net/npcm750_eth.c
@@ -3,6 +3,7 @@
  * Copyright (c) 2021 Nuvoton Technology Corp.
  */
 
+#include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <errno.h>
diff --git a/drivers/net/pch_gbe.c b/drivers/net/pch_gbe.c
index adeca3d040d..ecf8c28fe41 100644
--- a/drivers/net/pch_gbe.c
+++ b/drivers/net/pch_gbe.c
@@ -5,6 +5,7 @@
  * Intel Platform Controller Hub EG20T (codename Topcliff) GMAC Driver
  */
 
+#include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <errno.h>
diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c
index 180a96af16b..a1f3c2bd290 100644
--- a/drivers/net/pcnet.c
+++ b/drivers/net/pcnet.c
@@ -6,6 +6,7 @@
  * Linux driver pcnet32.c written 1996-1999 by Thomas Bogendoerfer.
  */
 
+#include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
diff --git a/drivers/net/pfe_eth/pfe_cmd.c b/drivers/net/pfe_eth/pfe_cmd.c
index 99c2a8d4e92..2fe0db0fe71 100644
--- a/drivers/net/pfe_eth/pfe_cmd.c
+++ b/drivers/net/pfe_eth/pfe_cmd.c
@@ -9,6 +9,7 @@
  * @brief PFE utility commands
  */
 
+#include <common.h>
 #include <command.h>
 #include <log.h>
 #include <linux/delay.h>
diff --git a/drivers/net/pfe_eth/pfe_eth.c b/drivers/net/pfe_eth/pfe_eth.c
index e24a6f93d91..ab532c5a420 100644
--- a/drivers/net/pfe_eth/pfe_eth.c
+++ b/drivers/net/pfe_eth/pfe_eth.c
@@ -4,7 +4,7 @@
  * Copyright 2017 NXP
  */
 
-#include <config.h>
+#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
diff --git a/drivers/net/pfe_eth/pfe_mdio.c b/drivers/net/pfe_eth/pfe_mdio.c
index ce2f76eabc8..ff48726dbf5 100644
--- a/drivers/net/pfe_eth/pfe_mdio.c
+++ b/drivers/net/pfe_eth/pfe_mdio.c
@@ -3,7 +3,7 @@
  * Copyright 2015-2016 Freescale Semiconductor, Inc.
  * Copyright 2017 NXP
  */
-#include <config.h>
+#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c
index ce448810ff6..0970449d0f9 100644
--- a/drivers/net/phy/adin.c
+++ b/drivers/net/phy/adin.c
@@ -6,6 +6,7 @@
  * Copyright 2022 Variscite Ltd.
  * Copyright 2022 Josua Mayer <[email protected]>
  */
+#include <common.h>
 #include <phy.h>
 #include <linux/bitops.h>
 #include <linux/bitfield.h>
diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c
index 4517a6b13ba..a958e88d44f 100644
--- a/drivers/net/phy/aquantia.c
+++ b/drivers/net/phy/aquantia.c
@@ -6,6 +6,7 @@
  * Copyright 2018, 2021 NXP
  */
 #include <config.h>
+#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <net.h>
diff --git a/drivers/net/phy/atheros.c b/drivers/net/phy/atheros.c
index 61525f68c35..abb7bdf537c 100644
--- a/drivers/net/phy/atheros.c
+++ b/drivers/net/phy/atheros.c
@@ -6,6 +6,7 @@
  * author Andy Fleming
  * Copyright (c) 2019 Michael Walle <[email protected]>
  */
+#include <common.h>
 #include <phy.h>
 #include <dm/device_compat.h>
 #include <linux/bitfield.h>
diff --git a/drivers/net/phy/b53.c b/drivers/net/phy/b53.c
index e95363067fe..26e8e2fe64f 100644
--- a/drivers/net/phy/b53.c
+++ b/drivers/net/phy/b53.c
@@ -22,6 +22,7 @@
  * cover other switches would be trivial.
  */
 
+#include <common.h>
 #include <command.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index 0a49015eb89..ecccb7c3b54 100644
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -5,6 +5,7 @@
  * Copyright 2010-2011 Freescale Semiconductor, Inc.
  * author Andy Fleming
  */
+#include <common.h>
 #include <phy.h>
 #include <linux/delay.h>
 
diff --git a/drivers/net/phy/ca_phy.c b/drivers/net/phy/ca_phy.c
index 5b2c67d2fda..edef21867b0 100644
--- a/drivers/net/phy/ca_phy.c
+++ b/drivers/net/phy/ca_phy.c
@@ -8,6 +8,7 @@
  */
 
 #include <config.h>
+#include <common.h>
 #include <log.h>
 #include <malloc.h>
 #include <linux/ctype.h>
diff --git a/drivers/net/phy/cortina.c b/drivers/net/phy/cortina.c
index d043e859bad..1cf8b28f582 100644
--- a/drivers/net/phy/cortina.c
+++ b/drivers/net/phy/cortina.c
@@ -8,6 +8,7 @@
  */
 
 #include <config.h>
+#include <common.h>
 #include <log.h>
 #include <malloc.h>
 #include <linux/ctype.h>
diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c
index 72d66812985..31ffa1ac7a9 100644
--- a/drivers/net/phy/davicom.c
+++ b/drivers/net/phy/davicom.c
@@ -5,6 +5,7 @@
  * Copyright 2010-2011 Freescale Semiconductor, Inc.
  * author Andy Fleming
  */
+#include <common.h>
 #include <phy.h>
 
 #define MIIM_DM9161_SCR                0x10
diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c
index 772cde1c520..b6726031ebb 100644
--- a/drivers/net/phy/dp83867.c
+++ b/drivers/net/phy/dp83867.c
@@ -3,6 +3,7 @@
  * TI PHY drivers
  *
  */
+#include <common.h>
 #include <log.h>
 #include <phy.h>
 #include <dm/devres.h>
diff --git a/drivers/net/phy/dp83869.c b/drivers/net/phy/dp83869.c
index b6fb5adae1f..f9d4782580e 100644
--- a/drivers/net/phy/dp83869.c
+++ b/drivers/net/phy/dp83869.c
@@ -4,6 +4,7 @@
  *
  */
 
+#include <common.h>
 #include <phy.h>
 #include <linux/compat.h>
 #include <malloc.h>
diff --git a/drivers/net/phy/ethernet_id.c b/drivers/net/phy/ethernet_id.c
index 2f8454ca27d..4dfdee60dcc 100644
--- a/drivers/net/phy/ethernet_id.c
+++ b/drivers/net/phy/ethernet_id.c
@@ -5,6 +5,7 @@
  * Copyright (C) 2022 Xilinx, Inc.
  */
 
+#include <common.h>
 #include <dm/device_compat.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c
index 11d36164976..2f0823b8365 100644
--- a/drivers/net/phy/fixed.c
+++ b/drivers/net/phy/fixed.c
@@ -6,6 +6,7 @@
  */
 
 #include <config.h>
+#include <common.h>
 #include <malloc.h>
 #include <phy.h>
 #include <dm.h>
diff --git a/drivers/net/phy/generic_10g.c b/drivers/net/phy/generic_10g.c
index 38dc9a88563..34ac51ea070 100644
--- a/drivers/net/phy/generic_10g.c
+++ b/drivers/net/phy/generic_10g.c
@@ -7,6 +7,7 @@
  *
  * Based loosely off of Linux's PHY Lib
  */
+#include <common.h>
 #include <miiphy.h>
 #include <phy.h>
 
diff --git a/drivers/net/phy/intel_xway.c b/drivers/net/phy/intel_xway.c
index fe50eec011a..9d1b97d349f 100644
--- a/drivers/net/phy/intel_xway.c
+++ b/drivers/net/phy/intel_xway.c
@@ -1,4 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0+
+#include <common.h>
 #include <phy.h>
 #include <linux/bitfield.h>
 
diff --git a/drivers/net/phy/lxt.c b/drivers/net/phy/lxt.c
index a817c58b128..20940033a38 100644
--- a/drivers/net/phy/lxt.c
+++ b/drivers/net/phy/lxt.c
@@ -5,6 +5,7 @@
  * Copyright 2010-2011 Freescale Semiconductor, Inc.
  * author Andy Fleming
  */
+#include <common.h>
 #include <phy.h>
 
 /* LXT971 Status 2 registers */
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index b0a0b7fcb38..0a90f710dfe 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -5,6 +5,7 @@
  * Copyright 2010-2011 Freescale Semiconductor, Inc.
  * author Andy Fleming
  */
+#include <common.h>
 #include <errno.h>
 #include <marvell_phy.h>
 #include <phy.h>
diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c
index 8c95bcbb9ad..9e64672f5ca 100644
--- a/drivers/net/phy/marvell10g.c
+++ b/drivers/net/phy/marvell10g.c
@@ -22,6 +22,7 @@
  * If both the fiber and copper ports are connected, the first to gain
  * link takes priority and the other port is completely locked out.
  */
+#include <common.h>
 #include <console.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
diff --git a/drivers/net/phy/meson-gxl.c b/drivers/net/phy/meson-gxl.c
index d43b476b3c8..b49c9b5f495 100644
--- a/drivers/net/phy/meson-gxl.c
+++ b/drivers/net/phy/meson-gxl.c
@@ -7,6 +7,7 @@
  * Author: Neil Armstrong <[email protected]>
  */
 #include <config.h>
+#include <common.h>
 #include <linux/bitops.h>
 #include <dm.h>
 #include <phy.h>
diff --git a/drivers/net/phy/micrel_ksz8xxx.c b/drivers/net/phy/micrel_ksz8xxx.c
index a9a64466ac2..b0f3abcb037 100644
--- a/drivers/net/phy/micrel_ksz8xxx.c
+++ b/drivers/net/phy/micrel_ksz8xxx.c
@@ -6,6 +6,7 @@
  * author Andy Fleming
  * (C) 2012 NetModule AG, David Andrey, added KSZ9031
  */
+#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
diff --git a/drivers/net/phy/micrel_ksz90x1.c b/drivers/net/phy/micrel_ksz90x1.c
index 556d75e31ed..ffc3c987eaa 100644
--- a/drivers/net/phy/micrel_ksz90x1.c
+++ b/drivers/net/phy/micrel_ksz90x1.c
@@ -8,6 +8,7 @@
  * (C) Copyright 2017 Adaptrum, Inc.
  * Written by Alexandru Gagniuc <[email protected]> for Adaptrum, Inc.
  */
+#include <common.h>
 #include <dm.h>
 #include <env.h>
 #include <errno.h>
diff --git a/drivers/net/phy/miiphybb.c b/drivers/net/phy/miiphybb.c
index 083d9d3996d..cf71f7d4e7e 100644
--- a/drivers/net/phy/miiphybb.c
+++ b/drivers/net/phy/miiphybb.c
@@ -12,6 +12,7 @@
  * channel.
  */
 
+#include <common.h>
 #include <ioports.h>
 #include <ppc_asm.tmpl>
 #include <miiphy.h>
diff --git a/drivers/net/phy/motorcomm.c b/drivers/net/phy/motorcomm.c
index a96430cec43..a2c763c8791 100644
--- a/drivers/net/phy/motorcomm.c
+++ b/drivers/net/phy/motorcomm.c
@@ -6,6 +6,7 @@
  */
 
 #include <config.h>
+#include <common.h>
 #include <malloc.h>
 #include <phy.h>
 #include <linux/bitfield.h>
diff --git a/drivers/net/phy/mv88e61xx.c b/drivers/net/phy/mv88e61xx.c
index ecc10f788af..85778106edd 100644
--- a/drivers/net/phy/mv88e61xx.c
+++ b/drivers/net/phy/mv88e61xx.c
@@ -29,6 +29,7 @@
  * changes may be required.
  */
 
+#include <common.h>
 #include <log.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
diff --git a/drivers/net/phy/mv88e6352.c b/drivers/net/phy/mv88e6352.c
index 6284298ebc1..56060762d85 100644
--- a/drivers/net/phy/mv88e6352.c
+++ b/drivers/net/phy/mv88e6352.c
@@ -4,6 +4,7 @@
  * Valentin Lontgchamp, Keymile AG, [email protected]
  */
 
+#include <common.h>
 #include <command.h>
 #include <log.h>
 #include <miiphy.h>
diff --git a/drivers/net/phy/natsemi.c b/drivers/net/phy/natsemi.c
index f7e514ef203..6b9e99ea115 100644
--- a/drivers/net/phy/natsemi.c
+++ b/drivers/net/phy/natsemi.c
@@ -5,6 +5,7 @@
  * Copyright 2010-2011 Freescale Semiconductor, Inc.
  * author Andy Fleming
  */
+#include <common.h>
 #include <phy.h>
 
 /* NatSemi DP83630 */
diff --git a/drivers/net/phy/ncsi.c b/drivers/net/phy/ncsi.c
index a1de438ffff..2bca116a9d8 100644
--- a/drivers/net/phy/ncsi.c
+++ b/drivers/net/phy/ncsi.c
@@ -5,6 +5,7 @@
  * Copyright (C) 2019, IBM Corporation.
  */
 
+#include <common.h>
 #include <log.h>
 #include <malloc.h>
 #include <phy.h>
diff --git a/drivers/net/phy/nxp-c45-tja11xx.c b/drivers/net/phy/nxp-c45-tja11xx.c
index a1e4c3d053b..f24fc5b2de6 100644
--- a/drivers/net/phy/nxp-c45-tja11xx.c
+++ b/drivers/net/phy/nxp-c45-tja11xx.c
@@ -5,6 +5,7 @@
  * Copyright 2021 NXP
  * Author: Radu Pirea <[email protected]>
  */
+#include <common.h>
 #include <dm.h>
 #include <dm/devres.h>
 #include <linux/delay.h>
diff --git a/drivers/net/phy/nxp-tja11xx.c b/drivers/net/phy/nxp-tja11xx.c
index a61471f4277..471b0e322b5 100644
--- a/drivers/net/phy/nxp-tja11xx.c
+++ b/drivers/net/phy/nxp-tja11xx.c
@@ -6,6 +6,7 @@
  * Copyright (C) 2018 Marek Vasut <[email protected]>
  */
 
+#include <common.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/iopoll.h>
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index fbf85d90f54..270176cfe62 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -7,6 +7,7 @@
  *
  * Based loosely off of Linux's PHY Lib
  */
+#include <common.h>
 #include <console.h>
 #include <dm.h>
 #include <log.h>
diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
index 30f35cced9d..7e1036b2271 100644
--- a/drivers/net/phy/realtek.c
+++ b/drivers/net/phy/realtek.c
@@ -6,6 +6,7 @@
  * author Andy Fleming
  * Copyright 2016 Karsten Merker <[email protected]>
  */
+#include <common.h>
 #include <linux/bitops.h>
 #include <phy.h>
 #include <linux/delay.h>
diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c
index 0d823f5f2b1..056b607e0b8 100644
--- a/drivers/net/phy/smsc.c
+++ b/drivers/net/phy/smsc.c
@@ -9,6 +9,7 @@
  * Some code copied from linux kernel
  * Copyright (c) 2006 Herbert Valerio Riedel <[email protected]>
  */
+#include <common.h>
 #include <miiphy.h>
 
 /* This code does not check the partner abilities. */
diff --git a/drivers/net/phy/teranetics.c b/drivers/net/phy/teranetics.c
index b39311976d6..15f2c12ed83 100644
--- a/drivers/net/phy/teranetics.c
+++ b/drivers/net/phy/teranetics.c
@@ -5,6 +5,7 @@
  * Copyright 2010-2011 Freescale Semiconductor, Inc.
  * author Andy Fleming
  */
+#include <common.h>
 #include <phy.h>
 #include <linux/delay.h>
 
diff --git a/drivers/net/phy/vitesse.c b/drivers/net/phy/vitesse.c
index 4867d1931b4..c5cf0d7dfbd 100644
--- a/drivers/net/phy/vitesse.c
+++ b/drivers/net/phy/vitesse.c
@@ -6,6 +6,7 @@
  * Original Author: Andy Fleming
  * Add vsc8662 phy support - Priyanka Jain
  */
+#include <common.h>
 #include <miiphy.h>
 
 /* Cicada Auxiliary Control/Status Register */
diff --git a/drivers/net/phy/xilinx_gmii2rgmii.c b/drivers/net/phy/xilinx_gmii2rgmii.c
index e44b7b75bd5..e2969bc4842 100644
--- a/drivers/net/phy/xilinx_gmii2rgmii.c
+++ b/drivers/net/phy/xilinx_gmii2rgmii.c
@@ -5,6 +5,7 @@
  * Copyright (C) 2018 Xilinx, Inc.
  */
 
+#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <phy.h>
diff --git a/drivers/net/phy/xilinx_phy.c b/drivers/net/phy/xilinx_phy.c
index a59e17d11e5..c07c780193f 100644
--- a/drivers/net/phy/xilinx_phy.c
+++ b/drivers/net/phy/xilinx_phy.c
@@ -6,6 +6,7 @@
  */
 
 #include <config.h>
+#include <common.h>
 #include <log.h>
 #include <phy.h>
 #include <dm.h>
diff --git a/drivers/net/pic32_eth.c b/drivers/net/pic32_eth.c
index eea3c48aeff..1333a3aa7e4 100644
--- a/drivers/net/pic32_eth.c
+++ b/drivers/net/pic32_eth.c
@@ -3,6 +3,7 @@
  * (c) 2015 Purna Chandra Mandal <[email protected]>
  *
  */
+#include <common.h>
 #include <cpu_func.h>
 #include <errno.h>
 #include <dm.h>
diff --git a/drivers/net/pic32_mdio.c b/drivers/net/pic32_mdio.c
index 8610f9a1aa5..d4049cfea52 100644
--- a/drivers/net/pic32_mdio.c
+++ b/drivers/net/pic32_mdio.c
@@ -5,6 +5,7 @@
  * Copyright 2015 Microchip Inc.
  *	Purna Chandra Mandal <[email protected]>
  */
+#include <common.h>
 #include <phy.h>
 #include <miiphy.h>
 #include <errno.h>
diff --git a/drivers/net/qe/dm_qe_uec.c b/drivers/net/qe/dm_qe_uec.c
index ac3aedd8b49..6d1509d90cf 100644
--- a/drivers/net/qe/dm_qe_uec.c
+++ b/drivers/net/qe/dm_qe_uec.c
@@ -7,6 +7,7 @@
  * Copyright (C) 2020 Heiko Schocher <[email protected]>
  */
 
+#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <memalign.h>
diff --git a/drivers/net/qe/dm_qe_uec_phy.c b/drivers/net/qe/dm_qe_uec_phy.c
index 8c0168be859..a0bcc8d3e55 100644
--- a/drivers/net/qe/dm_qe_uec_phy.c
+++ b/drivers/net/qe/dm_qe_uec_phy.c
@@ -8,6 +8,7 @@
  * Copyright (C) 2020 Heiko Schocher <[email protected]>
  */
 
+#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <miiphy.h>
diff --git a/drivers/net/qe/uccf.c b/drivers/net/qe/uccf.c
index badf4e5db3e..00848a1a37d 100644
--- a/drivers/net/qe/uccf.c
+++ b/drivers/net/qe/uccf.c
@@ -7,7 +7,6 @@
  */
 
 #include <malloc.h>
-#include <stdio.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <linux/immap_qe.h>
diff --git a/drivers/net/qe/uccf.h b/drivers/net/qe/uccf.h
index e60bbe241cd..99f8458edf6 100644
--- a/drivers/net/qe/uccf.h
+++ b/drivers/net/qe/uccf.h
@@ -9,8 +9,8 @@
 #ifndef __UCCF_H__
 #define __UCCF_H__
 
-#include <linux/types.h>
-#include <linux/immap_qe.h>
+#include "common.h"
+#include "linux/immap_qe.h"
 #include <fsl_qe.h>
 
 /* Fast or Giga ethernet */
diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c
index f1401d2f6ed..4764bca7082 100644
--- a/drivers/net/ravb.c
+++ b/drivers/net/ravb.c
@@ -8,6 +8,7 @@
  * Based on the SuperH Ethernet driver.
  */
 
+#include <common.h>
 #include <clk.h>
 #include <cpu_func.h>
 #include <dm.h>
diff --git a/drivers/net/rswitch.c b/drivers/net/rswitch.c
index 8e1b6e2f6f6..5a69ca1a0f9 100644
--- a/drivers/net/rswitch.c
+++ b/drivers/net/rswitch.c
@@ -9,6 +9,7 @@
 
 #include <asm/io.h>
 #include <clk.h>
+#include <common.h>
 #include <dm.h>
 #include <dm/device-internal.h>
 #include <dm/device_compat.h>
diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c
index 2e0afad089f..d8f24ec81a2 100644
--- a/drivers/net/rtl8139.c
+++ b/drivers/net/rtl8139.c
@@ -68,6 +68,7 @@
  *
  */
 
+#include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index e80aebc0bcf..93e83661cec 100644
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -39,6 +39,7 @@
  * 26 August 2006 Mihai Georgian <[email protected]>
  * Modified to use le32_to_cpu and cpu_to_le32 properly
  */
+#include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <errno.h>
diff --git a/drivers/net/sandbox-raw-bus.c b/drivers/net/sandbox-raw-bus.c
index 15670d6d24a..fb1ba5a8c83 100644
--- a/drivers/net/sandbox-raw-bus.c
+++ b/drivers/net/sandbox-raw-bus.c
@@ -4,6 +4,7 @@
  * Copyright (c) 2018 Joe Hershberger <[email protected]>
  */
 
+#include <common.h>
 #include <asm/eth-raw-os.h>
 #include <dm.h>
 #include <errno.h>
diff --git a/drivers/net/sandbox-raw.c b/drivers/net/sandbox-raw.c
index 1d716716778..99eb7a3bbff 100644
--- a/drivers/net/sandbox-raw.c
+++ b/drivers/net/sandbox-raw.c
@@ -8,6 +8,7 @@
 
 #include <log.h>
 #include <asm/eth-raw-os.h>
+#include <common.h>
 #include <dm.h>
 #include <env.h>
 #include <malloc.h>
diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c
index fe3627db6e3..13022addb6a 100644
--- a/drivers/net/sandbox.c
+++ b/drivers/net/sandbox.c
@@ -6,6 +6,7 @@
  * Joe Hershberger <[email protected]>
  */
 
+#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index f1ce994cfd5..7b1f59dc498 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -9,6 +9,7 @@
  */
 
 #include <config.h>
+#include <common.h>
 #include <cpu_func.h>
 #include <env.h>
 #include <log.h>
diff --git a/drivers/net/sja1105.c b/drivers/net/sja1105.c
index 0ba84a4496f..48f044c6472 100644
--- a/drivers/net/sja1105.c
+++ b/drivers/net/sja1105.c
@@ -8,6 +8,7 @@
  * Ported from Linux (drivers/net/dsa/sja1105/).
  */
 
+#include <common.h>
 #include <dm/device_compat.h>
 #include <linux/bitops.h>
 #include <linux/bitrev.h>
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index f39ba40944f..616b7ce174f 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -5,6 +5,7 @@
  * (c) 2007 Pengutronix, Sascha Hauer <[email protected]>
  */
 
+#include <common.h>
 #include <command.h>
 #include <malloc.h>
 #include <net.h>
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c
index f4b97798d2d..8bff4fe9a9e 100644
--- a/drivers/net/sun8i_emac.c
+++ b/drivers/net/sun8i_emac.c
@@ -16,6 +16,7 @@
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <fdt_support.h>
diff --git a/drivers/net/sunxi_emac.c b/drivers/net/sunxi_emac.c
index 3dee849c97e..f546ad1fe8d 100644
--- a/drivers/net/sunxi_emac.c
+++ b/drivers/net/sunxi_emac.c
@@ -5,6 +5,7 @@
  * (C) Copyright 2012, Stefan Roese <[email protected]>
  */
 
+#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <log.h>
diff --git a/drivers/net/ti/am65-cpsw-nuss.c b/drivers/net/ti/am65-cpsw-nuss.c
index c70b42f6bcc..65ade1afd05 100644
--- a/drivers/net/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ti/am65-cpsw-nuss.c
@@ -6,6 +6,7 @@
  *
  */
 
+#include <common.h>
 #include <malloc.h>
 #include <asm/cache.h>
 #include <asm/gpio.h>
diff --git a/drivers/net/ti/cpsw-common.c b/drivers/net/ti/cpsw-common.c
index 3e66d7c7bdf..d5428274d19 100644
--- a/drivers/net/ti/cpsw-common.c
+++ b/drivers/net/ti/cpsw-common.c
@@ -5,6 +5,7 @@
  * Copyright (C) 2016, Texas Instruments, Incorporated
  */
 
+#include <common.h>
 #include <dm.h>
 #include <fdt_support.h>
 #include <asm/global_data.h>
diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c
index d7746f454ba..9a5e9642df1 100644
--- a/drivers/net/ti/cpsw.c
+++ b/drivers/net/ti/cpsw.c
@@ -5,6 +5,7 @@
  * Copyright (C) 2010-2018 Texas Instruments Incorporated - https://www.ti.com/
  */
 
+#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <log.h>
diff --git a/drivers/net/ti/cpsw_mdio.c b/drivers/net/ti/cpsw_mdio.c
index 9e0083ca789..f1b1eba75d0 100644
--- a/drivers/net/ti/cpsw_mdio.c
+++ b/drivers/net/ti/cpsw_mdio.c
@@ -6,6 +6,7 @@
  */
 
 #include <clk.h>
+#include <common.h>
 #include <dm/device_compat.h>
 #include <log.h>
 #include <malloc.h>
diff --git a/drivers/net/ti/davinci_emac.c b/drivers/net/ti/davinci_emac.c
index 03a1a7a1159..034877a7690 100644
--- a/drivers/net/ti/davinci_emac.c
+++ b/drivers/net/ti/davinci_emac.c
@@ -21,7 +21,7 @@
  * ver. 1.0: Sep 2005, Anant Gole - Created EMAC version for uBoot.
  * ver  1.1: Nov 2005, Anant Gole - Extended the RX logic for multiple descriptors
  */
-#include <config.h>
+#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <log.h>
diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c
index c6e5bf21cf0..43dbf3f1067 100644
--- a/drivers/net/ti/keystone_net.c
+++ b/drivers/net/ti/keystone_net.c
@@ -5,6 +5,7 @@
  * (C) Copyright 2012-2014
  *     Texas Instruments Incorporated, <www.ti.com>
  */
+#include <common.h>
 #include <command.h>
 #include <console.h>
 #include <asm/global_data.h>
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index 6481ee24a60..8833e3098d5 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -8,6 +8,7 @@
  */
 
 #include <config.h>
+#include <common.h>
 #include <dm.h>
 #include <malloc.h>
 #include <net.h>
diff --git a/drivers/net/vsc7385.c b/drivers/net/vsc7385.c
index bd1869dfc83..09883f06be2 100644
--- a/drivers/net/vsc7385.c
+++ b/drivers/net/vsc7385.c
@@ -13,6 +13,7 @@
  */
 
 #include <config.h>
+#include <common.h>
 #include <console.h>
 #include <log.h>
 #include <asm/io.h>
diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c
index a1a39f61488..ef151ee51b4 100644
--- a/drivers/net/xilinx_axi_emac.c
+++ b/drivers/net/xilinx_axi_emac.c
@@ -7,6 +7,7 @@
  */
 
 #include <config.h>
+#include <common.h>
 #include <cpu_func.h>
 #include <display_options.h>
 #include <dm.h>
diff --git a/drivers/net/xilinx_axi_mrmac.c b/drivers/net/xilinx_axi_mrmac.c
index 555651937f8..410fb25ddef 100644
--- a/drivers/net/xilinx_axi_mrmac.c
+++ b/drivers/net/xilinx_axi_mrmac.c
@@ -9,6 +9,7 @@
  */
 
 #include <config.h>
+#include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index c25ac2e6600..16ba915fbaa 100644
--- a/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c
@@ -6,6 +6,7 @@
  * Michal SIMEK <[email protected]>
  */
 
+#include <common.h>
 #include <log.h>
 #include <net.h>
 #include <config.h>
diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index b41ee95892e..7c57d32614f 100644
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -9,6 +9,7 @@
  */
 
 #include <clk.h>
+#include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <generic-phy.h>
author	Tom Rini <[email protected]>	2024-05-20 10:16:33 -0600
committer	Tom Rini <[email protected]>	2024-05-20 10:16:33 -0600
commit	d4781422d1268aa6deca3e49d2fb227e79c160b4 (patch)
tree	420073c8a29a401a3908803000df6f54673e1731 /drivers/net
parent	85854bc3324edd0c81047780ee60033d056fd490 (diff)
parent	a7f0154c412859323396111dd0c09dbafbc153cb (diff)