diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:02:37 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:02:37 +0100 |
| commit | 6584c1f8017a4a2c1fb963bf3db3b0d4212c11a6 (patch) | |
| tree | 11600434e483a0cd5220d3c033566677a23652ae /include | |
| parent | 8134a15b0df6988a5a2b88df8fe825fceb6bcf6b (diff) | |
| parent | ea26693b8fe5b68d9c88c5ca4bb9aa6e46f2a4db (diff) | |
| download | barebox-6584c1f8017a4a2c1fb963bf3db3b0d4212c11a6.tar.gz barebox-6584c1f8017a4a2c1fb963bf3db3b0d4212c11a6.tar.xz | |
Merge branch 'for-next/net'
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/designware.h | 3 | ||||
| -rw-r--r-- | include/smc911x.h | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/net/designware.h b/include/net/designware.h index 1c8a00edfc..3f31c97610 100644 --- a/include/net/designware.h +++ b/include/net/designware.h @@ -1,8 +1,11 @@ #ifndef __DWC_UNIMAC_H #define __DWC_UNIMAC_H +#include <linux/phy.h> + struct dwc_ether_platform_data { int phy_addr; + phy_interface_t interface; void (*fix_mac_speed)(int speed); }; diff --git a/include/smc911x.h b/include/smc911x.h index 148906b925..4a802ee52c 100644 --- a/include/smc911x.h +++ b/include/smc911x.h @@ -13,6 +13,12 @@ */ struct smc911x_plat { int shift; + unsigned int flags; + unsigned int phy_mask; /* external PHY only: mask out PHYs, + e.g. ~(1 << 5) to use PHY addr 5 */ }; +#define SMC911X_FORCE_INTERNAL_PHY 0x01 +#define SMC911X_FORCE_EXTERNAL_PHY 0x02 + #endif /* __SMC911X_PLATFORM_H_ */ |