net: Drop dm.h header file from phy.h

This header file should not be included in other header files. Remove it
and use other headers and C inclusions instead.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/cmd/mdio.c b/cmd/mdio.c
index c48bb51237c5cf4ac6a8750c83305a2e351d85f3..cfa45ad12a0a7cdb6703b771bf3728c0101dd38a 100644 (file)
--- a/cmd/mdio.c
+++ b/cmd/mdio.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <dm.h>
 #include <miiphy.h>
 #include <phy.h>
 

diff --git a/cmd/mii.c b/cmd/mii.c
index b52a55dc3397244059de7414d4f0f1e689c02f22..fe8602eb7c87148d5bfeb6479c2f90d38a5f63aa 100644 (file)
--- a/cmd/mii.c
+++ b/cmd/mii.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <dm.h>
 #include <miiphy.h>
 
 typedef struct _MII_field_desc_t {

diff --git a/include/dm/read.h b/include/dm/read.h
index b1a6108544031ea15ac50572606dcb1cf3947278..487ec9e9c933e26e47cb22d894ef63b7c143cb8f 100644 (file)
--- a/include/dm/read.h
+++ b/include/dm/read.h
@@ -11,6 +11,7 @@
 
 #include <linux/errno.h>
 
+#include <dm/device.h>
 #include <dm/fdtaddr.h>
 #include <dm/ofnode.h>
 #include <dm/uclass.h>

diff --git a/include/phy.h b/include/phy.h
index fedd14609192130f68447748cbe16c8e535d94b8..1dbbf651113845a8cf16fa31c022b81f72fddd23 100644 (file)
--- a/include/phy.h
+++ b/include/phy.h
@@ -9,14 +9,17 @@
 #ifndef _PHY_H
 #define _PHY_H
 
-#include <dm.h>
+#include <log.h>
+#include <phy_interface.h>
+#include <dm/ofnode.h>
+#include <dm/read.h>
 #include <linux/errno.h>
 #include <linux/list.h>
 #include <linux/mii.h>
 #include <linux/ethtool.h>
 #include <linux/mdio.h>
-#include <log.h>
-#include <phy_interface.h>
+
+struct udevice;
 
 #define PHY_FIXED_ID           0xa5a55a5a
 #define PHY_NCSI_ID            0xbeefcafe

diff --git a/include/phy_interface.h b/include/phy_interface.h
index 882e4af8ffd55dbad6390902662e71c530f20cef..841ade311efbcb6dd76ffd3f6a947b7fd656b837 100644 (file)
--- a/include/phy_interface.h
+++ b/include/phy_interface.h
@@ -10,6 +10,8 @@
 #ifndef _PHY_INTERFACE_H
 #define _PHY_INTERFACE_H
 
+#include <string.h>
+
 typedef enum {
        PHY_INTERFACE_MODE_MII,
        PHY_INTERFACE_MODE_GMII,

diff --git a/net/eth_legacy.c b/net/eth_legacy.c
index 340469ba3aa72d51608f1fc5052879bf21cee2ca..992d1880bf3eb7ac30a2fdd4eb7885d845659717 100644 (file)
--- a/net/eth_legacy.c
+++ b/net/eth_legacy.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <bootstage.h>
 #include <command.h>
+#include <dm.h>
 #include <env.h>
 #include <log.h>
 #include <net.h>