diff options
| author | Claudiu Manoil <claudiu.manoil@freescale.com> | 2014-09-05 13:52:36 +0800 |
|---|---|---|
| committer | York Sun <yorksun@freescale.com> | 2014-09-08 10:30:33 -0700 |
| commit | 93f26f130eede8db0cb47afcaf66016987b91731 (patch) | |
| tree | 1a9acbbcb9b5bae1ae6c96a210ef087f5ecbda93 /include | |
| parent | df0a5b880d6e53b62ea05b483243dd8675cf4648 (diff) | |
| download | u-boot-imx-93f26f130eede8db0cb47afcaf66016987b91731.zip u-boot-imx-93f26f130eede8db0cb47afcaf66016987b91731.tar.gz u-boot-imx-93f26f130eede8db0cb47afcaf66016987b91731.tar.bz2 | |
net: Merge asm/fsl_enet.h into fsl_mdio.h
fsl_enet.h defines the mapping of the usual MII management
registers, which are included in the MDIO register block
common to Freescale ethernet controllers. So it shouldn't
depend on the CPU architecture but it should be actually
part of the arch independent fsl_mdio.h.
To remove the arch dependency, merge the content of
asm/fsl_enet.h into fsl_mdio.h.
Some files (like fm_eth.h) were simply including fsl_enet.h
only for phy.h. These were updated to include phy.h instead.
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/fm_eth.h | 2 | ||||
| -rw-r--r-- | include/fsl_mdio.h | 13 | ||||
| -rw-r--r-- | include/tsec.h | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/include/fm_eth.h b/include/fm_eth.h index 98edfcf..e46a684 100644 --- a/include/fm_eth.h +++ b/include/fm_eth.h @@ -8,8 +8,8 @@ #define __FM_ETH_H__ #include <common.h> +#include <phy.h> #include <asm/types.h> -#include <asm/fsl_enet.h> enum fm_port { FM1_DTSEC1, diff --git a/include/fsl_mdio.h b/include/fsl_mdio.h index b58713d..2137282 100644 --- a/include/fsl_mdio.h +++ b/include/fsl_mdio.h @@ -10,7 +10,18 @@ #include <net.h> #include <miiphy.h> -#include <asm/fsl_enet.h> + +struct tsec_mii_mng { + u32 miimcfg; /* MII management configuration reg */ + u32 miimcom; /* MII management command reg */ + u32 miimadd; /* MII management address reg */ + u32 miimcon; /* MII management control reg */ + u32 miimstat; /* MII management status reg */ + u32 miimind; /* MII management indication reg */ + u32 ifstat; /* Interface Status Register */ +}; + +int fdt_fixup_phy_connection(void *blob, int offset, phy_interface_t phyc); /* PHY register offsets */ #define PHY_EXT_PAGE_ACCESS 0x1f diff --git a/include/tsec.h b/include/tsec.h index 1046426..2054715 100644 --- a/include/tsec.h +++ b/include/tsec.h @@ -20,7 +20,7 @@ #include <net.h> #include <config.h> #include <phy.h> -#include <asm/fsl_enet.h> +#include <fsl_mdio.h> #define TSEC_SIZE 0x01000 #define TSEC_MDIO_OFFSET 0x01000 |