diff options
author | Kim Phillips <kim.phillips@freescale.com> | 2007-04-13 02:26:03 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-04-28 11:01:04 -0400 |
commit | 728de4c927a3544b6d3da331b634035d4c75ca17 (patch) | |
tree | 5f05e0b318de9c1d517bd7bbca5964249c7cc885 /include/linux | |
parent | a999589ccaae16472531e0616f23826ad097aa40 (diff) |
ucc_geth: migrate ucc_geth to phylib
migrate ucc_geth to use the common phylib code.
There are several side effects from doing this:
o deprecate 'interface' property specification present
in some old device tree source files in
favour of a split 'max-speed' and 'interface-type'
description to appropriately match definitions
in include/linux/phy.h. Note that 'interface' property
is still honoured if max-speed or interface-type
are not present (backward compatible).
o compile-time CONFIG_UGETH_HAS_GIGA is eliminated
in favour of probe time speed derivation logic.
o adjust_link streamlined to only operate on maccfg2
and upsmr.r10m, instead of reapplying static initial
values related to the interface-type.
o Addition of UEC MDIO of_platform driver requires
platform code add 'mdio' type to id list
prior to calling of_platform_bus_probe (separate patch).
o ucc_struct_init introduced to reduce ucc_geth_startup
complexity.
Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/fsl_devices.h | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h index abb64c437f6f..73710d617775 100644 --- a/include/linux/fsl_devices.h +++ b/include/linux/fsl_devices.h | |||
@@ -120,44 +120,5 @@ struct fsl_spi_platform_data { | |||
120 | u32 sysclk; | 120 | u32 sysclk; |
121 | }; | 121 | }; |
122 | 122 | ||
123 | /* Ethernet interface (phy management and speed) | ||
124 | */ | ||
125 | enum enet_interface { | ||
126 | ENET_10_MII, /* 10 Base T, MII interface */ | ||
127 | ENET_10_RMII, /* 10 Base T, RMII interface */ | ||
128 | ENET_10_RGMII, /* 10 Base T, RGMII interface */ | ||
129 | ENET_100_MII, /* 100 Base T, MII interface */ | ||
130 | ENET_100_RMII, /* 100 Base T, RMII interface */ | ||
131 | ENET_100_RGMII, /* 100 Base T, RGMII interface */ | ||
132 | ENET_1000_GMII, /* 1000 Base T, GMII interface */ | ||
133 | ENET_1000_RGMII, /* 1000 Base T, RGMII interface */ | ||
134 | ENET_1000_TBI, /* 1000 Base T, TBI interface */ | ||
135 | ENET_1000_RTBI /* 1000 Base T, RTBI interface */ | ||
136 | }; | ||
137 | |||
138 | struct ucc_geth_platform_data { | ||
139 | /* device specific information */ | ||
140 | u32 device_flags; | ||
141 | u32 phy_reg_addr; | ||
142 | |||
143 | /* board specific information */ | ||
144 | u32 board_flags; | ||
145 | u8 rx_clock; | ||
146 | u8 tx_clock; | ||
147 | u32 phy_id; | ||
148 | enum enet_interface phy_interface; | ||
149 | u32 phy_interrupt; | ||
150 | u8 mac_addr[6]; | ||
151 | }; | ||
152 | |||
153 | /* Flags related to UCC Gigabit Ethernet device features */ | ||
154 | #define FSL_UGETH_DEV_HAS_GIGABIT 0x00000001 | ||
155 | #define FSL_UGETH_DEV_HAS_COALESCE 0x00000002 | ||
156 | #define FSL_UGETH_DEV_HAS_RMON 0x00000004 | ||
157 | |||
158 | /* Flags in ucc_geth_platform_data */ | ||
159 | #define FSL_UGETH_BRD_HAS_PHY_INTR 0x00000001 | ||
160 | /* if not set use a timer */ | ||
161 | |||
162 | #endif /* _FSL_DEVICE_H_ */ | 123 | #endif /* _FSL_DEVICE_H_ */ |
163 | #endif /* __KERNEL__ */ | 124 | #endif /* __KERNEL__ */ |