diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2014-02-13 13:14:48 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-02-14 15:51:31 -0500 |
| commit | ce11c436720cdb8437340be93b2f5efe23ce3e1c (patch) | |
| tree | 18bbed5b6178f27eb8bf03b195c800a8faa7ab00 /drivers/of | |
| parent | d43ff4cd798911736fb39025ec8004284b1b0bc2 (diff) | |
| download | talos-op-linux-ce11c436720cdb8437340be93b2f5efe23ce3e1c.tar.gz talos-op-linux-ce11c436720cdb8437340be93b2f5efe23ce3e1c.zip | |
net: of_mdio: fix of_set_phy_supported after driver probing
Commit 8fdade4 ("net: of_mdio: parse "max-speed" property to set PHY
supported features") introduced a typo in of_set_phy_supported for the
first assignment of phydev->supported which will not effectively limit
the PHY device supported features bits if the PHY driver contains
"higher" features (e.g: max-speed = <100> and PHY driver has
PHY_GBIT_FEATURES set).
Fix this by making sure that the very first thing is to reset to sane
defaults (PHY_BASIC_FEATURES) and then progressively add speed features
as we parse them.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/of_mdio.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c index 875b7b6f0d2a..495faccba763 100644 --- a/drivers/of/of_mdio.c +++ b/drivers/of/of_mdio.c @@ -24,7 +24,11 @@ MODULE_LICENSE("GPL"); static void of_set_phy_supported(struct phy_device *phydev, u32 max_speed) { - phydev->supported |= PHY_DEFAULT_FEATURES; + /* The default values for phydev->supported are provided by the PHY + * driver "features" member, we want to reset to sane defaults fist + * before supporting higher speeds. + */ + phydev->supported &= PHY_DEFAULT_FEATURES; switch (max_speed) { default: |
