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>

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index f7c61812ea4aa20fe0141b60b912805cd2ea9eda..e56e269a6eb3a0949954cbe685c26aa203bf9e38 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -138,10 +138,30 @@ struct phy_setting {
 /* A mapping of all SUPPORTED settings to speed/duplex */
 static const struct phy_setting settings[] = {
        {
-               .speed = 10000,
+               .speed = SPEED_10000,
+               .duplex = DUPLEX_FULL,
+               .setting = SUPPORTED_10000baseKR_Full,
+       },
+       {
+               .speed = SPEED_10000,
+               .duplex = DUPLEX_FULL,
+               .setting = SUPPORTED_10000baseKX4_Full,
+       },
+       {
+               .speed = SPEED_10000,
                .duplex = DUPLEX_FULL,
                .setting = SUPPORTED_10000baseT_Full,
        },
+       {
+               .speed = SPEED_2500,
+               .duplex = DUPLEX_FULL,
+               .setting = SUPPORTED_2500baseX_Full,
+       },
+       {
+               .speed = SPEED_1000,
+               .duplex = DUPLEX_FULL,
+               .setting = SUPPORTED_1000baseKX_Full,
+       },
        {
                .speed = SPEED_1000,
                .duplex = DUPLEX_FULL,