diff options
| author | Stefano Babic <sbabic@denx.de> | 2014-03-05 12:51:26 +0100 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-03-05 12:51:26 +0100 |
| commit | 1ad6364eeb4f578e423081d1748e8a3fdf1ab01d (patch) | |
| tree | f55731737edf1cfd653b21f2ff9d387e6c53ae24 /drivers/net/designware.h | |
| parent | 335143c76612a0ae26eef8abeda77641d4f63b50 (diff) | |
| parent | cc07294bc704694ae33db75b25ac557e5917a83f (diff) | |
| download | u-boot-imx-1ad6364eeb4f578e423081d1748e8a3fdf1ab01d.zip u-boot-imx-1ad6364eeb4f578e423081d1748e8a3fdf1ab01d.tar.gz u-boot-imx-1ad6364eeb4f578e423081d1748e8a3fdf1ab01d.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'drivers/net/designware.h')
| -rw-r--r-- | drivers/net/designware.h | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/drivers/net/designware.h b/drivers/net/designware.h index 5440c92..afeacce 100644 --- a/drivers/net/designware.h +++ b/drivers/net/designware.h @@ -16,8 +16,6 @@ #define CONFIG_MACRESET_TIMEOUT (3 * CONFIG_SYS_HZ) #define CONFIG_MDIO_TIMEOUT (3 * CONFIG_SYS_HZ) -#define CONFIG_PHYRESET_TIMEOUT (3 * CONFIG_SYS_HZ) -#define CONFIG_AUTONEG_TIMEOUT (5 * CONFIG_SYS_HZ) struct eth_mac_regs { u32 conf; /* 0x00 */ @@ -217,14 +215,9 @@ struct dmamacdescr { #endif struct dw_eth_dev { - u32 address; u32 interface; - u32 speed; - u32 duplex; u32 tx_currdescnum; u32 rx_currdescnum; - u32 phy_configured; - u32 link_printed; struct dmamacdescr tx_mac_descrtable[CONFIG_TX_DESCR_NUM]; struct dmamacdescr rx_mac_descrtable[CONFIG_RX_DESCR_NUM]; @@ -236,15 +229,8 @@ struct dw_eth_dev { struct eth_dma_regs *dma_regs_p; struct eth_device *dev; + struct phy_device *phydev; + struct mii_dev *bus; }; -/* Speed specific definitions */ -#define SPEED_10M 1 -#define SPEED_100M 2 -#define SPEED_1000M 3 - -/* Duplex mode specific definitions */ -#define HALF_DUPLEX 1 -#define FULL_DUPLEX 2 - #endif |