Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c242a472 authored by Sascha Hauer's avatar Sascha Hauer Committed by David S. Miller
Browse files

net: phy: genphy: Allow overwriting features 



of_set_phy_supported allows overwiting hardware capabilities of
a phy with values from the devicetree. This does not work with
the genphy driver though because the genphys config_init function
will overwrite all values adjusted by of_set_phy_supported. Fix
this by initialising the genphy features in the phy_driver struct
and in config_init just limit the features to the ones the hardware
can actually support. The resulting features are a subset of the
devicetree specified features and the hardware features.

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a6cea535

drivers/net/phy/phy_device.c

+5 −6
Original line number Diff line number Diff line
@@ -1072,9 +1072,6 @@ int genphy_config_init(struct phy_device *phydev) 
	int val;

	u32 features;



	/* For now, I'll claim that the generic driver supports

	 * all possible port types

	 */

	features = (SUPPORTED_TP | SUPPORTED_MII

			| SUPPORTED_AUI | SUPPORTED_FIBRE |

			SUPPORTED_BNC);
@@ -1107,8 +1104,8 @@ int genphy_config_init(struct phy_device *phydev) 
			features |= SUPPORTED_1000baseT_Half;

	}



	phydev->supported = features;

	phydev->advertising = features;

	phydev->supported &= features;

	phydev->advertising &= features;



	return 0;

}
@@ -1296,7 +1293,9 @@ static struct phy_driver genphy_driver[] = { 
	.name		= "Generic PHY",

	.soft_reset	= genphy_soft_reset,

	.config_init	= genphy_config_init,

	.features	= 0,

	.features	= PHY_GBIT_FEATURES | SUPPORTED_MII |

			  SUPPORTED_AUI | SUPPORTED_FIBRE |

			  SUPPORTED_BNC,

	.config_aneg	= genphy_config_aneg,

	.aneg_done	= genphy_aneg_done,

	.read_status	= genphy_read_status,