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

Commit dcdecdcf authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

net: phy: switch drivers to use dynamic feature detection 



Recently genphy_read_abilities() has been added that dynamically detects
clause 22 PHY abilities. I *think* this detection should work with all
supported PHY's, at least for the ones with basic features sets, i.e.
PHY_BASIC_FEATURES and PHY_GBIT_FEATURES. So let's remove setting these
features explicitly and rely on phylib feature detection.

I don't have access to most of these PHY's, therefore I'd appreciate
regression testing.

v2:
- make the feature constant a comment so that readers know which
  features are supported by the respective PHY

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Tested-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b6ed55cb

drivers/net/phy/amd.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static struct phy_driver am79c_driver[] = { { 
	.phy_id		= PHY_ID_AM79C874,

	.name		= "AM79C874",

	.phy_id_mask	= 0xfffffff0,

	.features	= PHY_BASIC_FEATURES,

	/* PHY_BASIC_FEATURES */

	.config_init	= am79c_config_init,

	.ack_interrupt	= am79c_ack_interrupt,

	.config_intr	= am79c_config_intr,

drivers/net/phy/asix.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static struct phy_driver asix_driver[] = { { 
	.phy_id		= PHY_ID_ASIX_AX88796B,

	.name		= "Asix Electronics AX88796B",

	.phy_id_mask	= 0xfffffff0,

	.features	= PHY_BASIC_FEATURES,

	/* PHY_BASIC_FEATURES */

	.soft_reset	= asix_soft_reset,

} };

drivers/net/phy/at803x.c

+3 −3
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ static struct phy_driver at803x_driver[] = { 
	.get_wol		= at803x_get_wol,

	.suspend		= at803x_suspend,

	.resume			= at803x_resume,

	.features		= PHY_GBIT_FEATURES,

	/* PHY_GBIT_FEATURES */

	.ack_interrupt		= at803x_ack_interrupt,

	.config_intr		= at803x_config_intr,

}, {
@@ -404,7 +404,7 @@ static struct phy_driver at803x_driver[] = { 
	.get_wol		= at803x_get_wol,

	.suspend		= at803x_suspend,

	.resume			= at803x_resume,

	.features		= PHY_BASIC_FEATURES,

	/* PHY_BASIC_FEATURES */

	.ack_interrupt		= at803x_ack_interrupt,

	.config_intr		= at803x_config_intr,

}, {
@@ -418,7 +418,7 @@ static struct phy_driver at803x_driver[] = { 
	.get_wol		= at803x_get_wol,

	.suspend		= at803x_suspend,

	.resume			= at803x_resume,

	.features		= PHY_GBIT_FEATURES,

	/* PHY_GBIT_FEATURES */

	.aneg_done		= at803x_aneg_done,

	.ack_interrupt		= &at803x_ack_interrupt,

	.config_intr		= &at803x_config_intr,

drivers/net/phy/bcm-cygnus.c

+2 −2
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ static struct phy_driver bcm_cygnus_phy_driver[] = { 
	.phy_id        = PHY_ID_BCM_CYGNUS,

	.phy_id_mask   = 0xfffffff0,

	.name          = "Broadcom Cygnus PHY",

	.features      = PHY_GBIT_FEATURES,

	/* PHY_GBIT_FEATURES */

	.config_init   = bcm_cygnus_config_init,

	.ack_interrupt = bcm_phy_ack_intr,

	.config_intr   = bcm_phy_config_intr,
@@ -264,7 +264,7 @@ static struct phy_driver bcm_cygnus_phy_driver[] = { 
	.phy_id		= PHY_ID_BCM_OMEGA,

	.phy_id_mask	= 0xfffffff0,

	.name		= "Broadcom Omega Combo GPHY",

	.features	= PHY_GBIT_FEATURES,

	/* PHY_GBIT_FEATURES */

	.flags		= PHY_IS_INTERNAL,

	.config_init	= bcm_omega_config_init,

	.suspend	= genphy_suspend,

drivers/net/phy/bcm63xx.c

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static struct phy_driver bcm63xx_driver[] = { 
	.phy_id		= 0x00406000,

	.phy_id_mask	= 0xfffffc00,

	.name		= "Broadcom BCM63XX (1)",

	.features	= PHY_BASIC_FEATURES,

	/* PHY_BASIC_FEATURES */

	.flags		= PHY_IS_INTERNAL,

	.config_init	= bcm63xx_config_init,

	.ack_interrupt	= bcm_phy_ack_intr,
@@ -73,7 +73,7 @@ static struct phy_driver bcm63xx_driver[] = { 
	/* same phy as above, with just a different OUI */

	.phy_id		= 0x002bdc00,

	.phy_id_mask	= 0xfffffc00,

	.features	= PHY_BASIC_FEATURES,

	/* PHY_BASIC_FEATURES */

	.flags		= PHY_IS_INTERNAL,

	.config_init	= bcm63xx_config_init,

	.ack_interrupt	= bcm_phy_ack_intr,