diff options
| author | Simon Glass | 2020-07-19 10:15:39 -0600 |
|---|---|---|
| committer | Tom Rini | 2020-08-03 22:19:54 -0400 |
| commit | 2a64ada78cba32196a4f49bd000a501fa2c96647 (patch) | |
| tree | 021dcdda9ef0f27396e7c73fd01b6c9aebcd4d9b | |
| parent | c2848cc2c35ccaedb10f23c3ee2a46ffdcc0de0c (diff) | |
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>
| -rw-r--r-- | cmd/mdio.c | 1 | ||||
| -rw-r--r-- | cmd/mii.c | 1 | ||||
| -rw-r--r-- | include/dm/read.h | 1 | ||||
| -rw-r--r-- | include/phy.h | 9 | ||||
| -rw-r--r-- | include/phy_interface.h | 2 | ||||
| -rw-r--r-- | net/eth_legacy.c | 1 |
6 files changed, 12 insertions, 3 deletions
diff --git a/cmd/mdio.c b/cmd/mdio.c index c48bb51237c..cfa45ad12a0 100644 --- 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 b52a55dc339..fe8602eb7c8 100644 --- 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 b1a61085440..487ec9e9c93 100644 --- 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 fedd1460919..1dbbf651113 100644 --- 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 882e4af8ffd..841ade311ef 100644 --- 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 340469ba3aa..992d1880bf3 100644 --- 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> |