aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/phy/phy.c
diff options
context:
space:
mode:
authorLendacky, Thomas <Thomas.Lendacky@amd.com>2014-07-14 15:05:46 -0400
committerDavid S. Miller <davem@davemloft.net>2014-07-15 19:30:04 -0400
commit3e7077067e80cdded012b7db19b7aae33ceb01e9 (patch)
tree3c36e7a87d1232298a72b7725c42dd59e7e307c8 /drivers/net/phy/phy.c
parentbfde3398e57c9defdbb552aaede680300e8a448a (diff)
phy: Expand phy speed/duplex settings array
Expand the phy speed/duplex settings array to support more than just baseT features. This change adds entries to support the following additional speed/duplex/media types: SUPPORTED_10000baseKR_Full SUPPORTED_10000baseKX4_Full SUPPORTED_2500baseX_Full SUPPORTED_1000baseKX_Full Additionally, it changes the 10GbE baseT entry from using the hardcoded value 10000 to the SPEED_10000 define. Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/phy.c')
-rw-r--r--drivers/net/phy/phy.c22
1 files changed, 21 insertions, 1 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index f7c61812ea4a..e56e269a6eb3 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -138,11 +138,31 @@ struct phy_setting {
138/* A mapping of all SUPPORTED settings to speed/duplex */ 138/* A mapping of all SUPPORTED settings to speed/duplex */
139static const struct phy_setting settings[] = { 139static const struct phy_setting settings[] = {
140 { 140 {
141 .speed = 10000, 141 .speed = SPEED_10000,
142 .duplex = DUPLEX_FULL,
143 .setting = SUPPORTED_10000baseKR_Full,
144 },
145 {
146 .speed = SPEED_10000,
147 .duplex = DUPLEX_FULL,
148 .setting = SUPPORTED_10000baseKX4_Full,
149 },
150 {
151 .speed = SPEED_10000,
142 .duplex = DUPLEX_FULL, 152 .duplex = DUPLEX_FULL,
143 .setting = SUPPORTED_10000baseT_Full, 153 .setting = SUPPORTED_10000baseT_Full,
144 }, 154 },
145 { 155 {
156 .speed = SPEED_2500,
157 .duplex = DUPLEX_FULL,
158 .setting = SUPPORTED_2500baseX_Full,
159 },
160 {
161 .speed = SPEED_1000,
162 .duplex = DUPLEX_FULL,
163 .setting = SUPPORTED_1000baseKX_Full,
164 },
165 {
146 .speed = SPEED_1000, 166 .speed = SPEED_1000,
147 .duplex = DUPLEX_FULL, 167 .duplex = DUPLEX_FULL,
148 .setting = SUPPORTED_1000baseT_Full, 168 .setting = SUPPORTED_1000baseT_Full,