Commit 3125c081 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: phy: bcm7xxx: Reduce boilerplate code for 40nm EPHY 



Introduce a macro which helps adding new 40NM EPHY entries and reduces the
amount of boilerplate code.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3ccc3055

drivers/net/phy/bcm7xxx.c

+18 −36
Original line number Diff line number Diff line
@@ -326,6 +326,21 @@ static int bcm7xxx_dummy_config_init(struct phy_device *phydev) 
	.resume		= bcm7xxx_28nm_resume,				\

}



#define BCM7XXX_40NM_EPHY(_oui, _name)					\

{									\

	.phy_id         = (_oui),					\

	.phy_id_mask    = 0xfffffff0,					\

	.name           = _name,					\

	.features       = PHY_BASIC_FEATURES |				\

			  SUPPORTED_Pause | SUPPORTED_Asym_Pause,	\

	.flags          = PHY_IS_INTERNAL,				\

	.config_init    = bcm7xxx_config_init,				\

	.config_aneg    = genphy_config_aneg,				\

	.read_status    = genphy_read_status,				\

	.suspend        = bcm7xxx_suspend,				\

	.resume         = bcm7xxx_config_init,				\

}



static struct phy_driver bcm7xxx_driver[] = {

	BCM7XXX_28NM_GPHY(PHY_ID_BCM7250, "Broadcom BCM7250"),

	BCM7XXX_28NM_GPHY(PHY_ID_BCM7364, "Broadcom BCM7364"),
@@ -333,43 +348,10 @@ static struct phy_driver bcm7xxx_driver[] = { 
	BCM7XXX_28NM_GPHY(PHY_ID_BCM7439, "Broadcom BCM7439"),

	BCM7XXX_28NM_GPHY(PHY_ID_BCM7439_2, "Broadcom BCM7439 (2)"),

	BCM7XXX_28NM_GPHY(PHY_ID_BCM7445, "Broadcom BCM7445"),

	BCM7XXX_40NM_EPHY(PHY_ID_BCM7425, "Broadcom BCM7425"),

	BCM7XXX_40NM_EPHY(PHY_ID_BCM7429, "Broadcom BCM7429"),

	BCM7XXX_40NM_EPHY(PHY_ID_BCM7435, "Broadcom BCM7435"),

{

	.phy_id         = PHY_ID_BCM7425,

	.phy_id_mask    = 0xfffffff0,

	.name           = "Broadcom BCM7425",

	.features       = PHY_GBIT_FEATURES |

			  SUPPORTED_Pause | SUPPORTED_Asym_Pause,

	.flags          = PHY_IS_INTERNAL,

	.config_init    = bcm7xxx_config_init,

	.config_aneg    = genphy_config_aneg,

	.read_status    = genphy_read_status,

	.suspend        = bcm7xxx_suspend,

	.resume         = bcm7xxx_config_init,

}, {

	.phy_id         = PHY_ID_BCM7429,

	.phy_id_mask    = 0xfffffff0,

	.name           = "Broadcom BCM7429",

	.features       = PHY_GBIT_FEATURES |

			  SUPPORTED_Pause | SUPPORTED_Asym_Pause,

	.flags          = PHY_IS_INTERNAL,

	.config_init    = bcm7xxx_config_init,

	.config_aneg    = genphy_config_aneg,

	.read_status    = genphy_read_status,

	.suspend        = bcm7xxx_suspend,

	.resume         = bcm7xxx_config_init,

}, {

	.phy_id         = PHY_ID_BCM7435,

	.phy_id_mask    = 0xfffffff0,

	.name           = "Broadcom BCM7435",

	.features       = PHY_GBIT_FEATURES |

			  SUPPORTED_Pause | SUPPORTED_Asym_Pause,

	.flags          = PHY_IS_INTERNAL,

	.config_init    = bcm7xxx_config_init,

	.config_aneg    = genphy_config_aneg,

	.read_status    = genphy_read_status,

	.suspend        = bcm7xxx_suspend,

	.resume         = bcm7xxx_config_init,

}, {

	.phy_id		= PHY_BCM_OUI_4,

	.phy_id_mask	= 0xffff0000,

	.name		= "Broadcom BCM7XXX 40nm",