[U-Boot] [PATCH v2 22/41] common: Move mii_init() function out of common.h
Simon Glass
sjg at chromium.org
Fri Nov 8 19:53:29 UTC 2019
This function belongs in mii.h so move it over.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
Changes in v2: None
arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 1 +
drivers/net/fsl_mcdmafec.c | 1 +
drivers/net/ldpaa_eth/ls1088a.c | 1 +
drivers/net/ldpaa_eth/lx2160a.c | 1 +
drivers/net/mcffec.c | 1 +
drivers/net/mcfmii.c | 1 +
drivers/net/mpc8xx_fec.c | 1 +
drivers/net/pic32_eth.c | 1 +
include/common.h | 3 ---
include/linux/mii.h | 2 ++
10 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index 0f83f6d179..0843d4207d 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
@@ -39,6 +39,7 @@
#include <fsl_validate.h>
#endif
#endif
+#include <linux/mii.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c
index e66fb16de8..b2936b78d7 100644
--- a/drivers/net/fsl_mcdmafec.c
+++ b/drivers/net/fsl_mcdmafec.c
@@ -14,6 +14,7 @@
#include <config.h>
#include <net.h>
#include <miiphy.h>
+#include <linux/mii.h>
#undef ET_DEBUG
#undef MII_DEBUG
diff --git a/drivers/net/ldpaa_eth/ls1088a.c b/drivers/net/ldpaa_eth/ls1088a.c
index c3260d318c..54cb16e51b 100644
--- a/drivers/net/ldpaa_eth/ls1088a.c
+++ b/drivers/net/ldpaa_eth/ls1088a.c
@@ -8,6 +8,7 @@
#include <asm/io.h>
#include <asm/arch/fsl_serdes.h>
#include <asm/arch/soc.h>
+#include <linux/mii.h>
u32 dpmac_to_devdisr[] = {
[WRIOP1_DPMAC1] = FSL_CHASSIS3_DEVDISR2_DPMAC1,
diff --git a/drivers/net/ldpaa_eth/lx2160a.c b/drivers/net/ldpaa_eth/lx2160a.c
index 1fbeb0d14b..9432b6eb85 100644
--- a/drivers/net/ldpaa_eth/lx2160a.c
+++ b/drivers/net/ldpaa_eth/lx2160a.c
@@ -8,6 +8,7 @@
#include <asm/io.h>
#include <asm/arch/fsl_serdes.h>
#include <asm/arch/soc.h>
+#include <linux/mii.h>
u32 dpmac_to_devdisr[] = {
[WRIOP1_DPMAC1] = FSL_CHASSIS3_DEVDISR2_DPMAC1,
diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c
index fb93041256..9a3a8455a1 100644
--- a/drivers/net/mcffec.c
+++ b/drivers/net/mcffec.c
@@ -18,6 +18,7 @@
#include <asm/fec.h>
#include <asm/immap.h>
+#include <linux/mii.h>
#undef ET_DEBUG
#undef MII_DEBUG
diff --git a/drivers/net/mcfmii.c b/drivers/net/mcfmii.c
index 961618b410..b8af2cc44b 100644
--- a/drivers/net/mcfmii.c
+++ b/drivers/net/mcfmii.c
@@ -15,6 +15,7 @@
#include <asm/fec.h>
#endif
#include <asm/immap.h>
+#include <linux/mii.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/net/mpc8xx_fec.c b/drivers/net/mpc8xx_fec.c
index f45f1e4677..0a80985192 100644
--- a/drivers/net/mpc8xx_fec.c
+++ b/drivers/net/mpc8xx_fec.c
@@ -13,6 +13,7 @@
#include <asm/io.h>
#include <phy.h>
+#include <linux/mii.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/net/pic32_eth.c b/drivers/net/pic32_eth.c
index b0f7677154..39c4b10ab8 100644
--- a/drivers/net/pic32_eth.c
+++ b/drivers/net/pic32_eth.c
@@ -12,6 +12,7 @@
#include <time.h>
#include <wait_bit.h>
#include <asm/gpio.h>
+#include <linux/mii.h>
#include "pic32_eth.h"
diff --git a/include/common.h b/include/common.h
index cc5f13ec7e..992675100d 100644
--- a/include/common.h
+++ b/include/common.h
@@ -254,9 +254,6 @@ void reset_timer (void);
void enable_interrupts (void);
int disable_interrupts (void);
-/* $(CPU)/.../<eth> */
-void mii_init (void);
-
/* arch/$(ARCH)/lib/cache.c */
void enable_caches(void);
void flush_cache (unsigned long, unsigned long);
diff --git a/include/linux/mii.h b/include/linux/mii.h
index 21db032340..49e29ac314 100644
--- a/include/linux/mii.h
+++ b/include/linux/mii.h
@@ -225,4 +225,6 @@ static inline u8 mii_resolve_flowctrl_fdx(u16 lcladv, u16 rmtadv)
return cap;
}
+void mii_init(void);
+
#endif /* __LINUX_MII_H__ */
--
2.24.0.rc1.363.gb1bccd3e3d-goog
More information about the U-Boot
mailing list