mirror of
https://github.com/AsahiLinux/u-boot
synced 2025-03-16 23:07:00 +00:00
net: phy: use ->is_c45 instead of is_10g_interface()
Use phydev->is_c45 instead of is_10g_interface(phydev->interface) to determine whether clause 45 protocol should be used. Signed-off-by: Marek Behún <marek.behun@nic.cz> Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
This commit is contained in:
parent
f961b3abf8
commit
79bef5fb1f
2 changed files with 4 additions and 16 deletions
|
@ -632,10 +632,10 @@ static int phy_probe(struct phy_device *phydev)
|
|||
return err;
|
||||
}
|
||||
|
||||
static struct phy_driver *generic_for_interface(phy_interface_t interface)
|
||||
static struct phy_driver *generic_for_phy(struct phy_device *phydev)
|
||||
{
|
||||
#ifdef CONFIG_PHYLIB_10G
|
||||
if (is_10g_interface(interface))
|
||||
if (phydev->is_c45)
|
||||
return &gen10g_driver;
|
||||
#endif
|
||||
|
||||
|
@ -656,7 +656,7 @@ static struct phy_driver *get_phy_driver(struct phy_device *phydev,
|
|||
}
|
||||
|
||||
/* If we made it here, there's no driver for this PHY */
|
||||
return generic_for_interface(interface);
|
||||
return generic_for_phy(phydev);
|
||||
}
|
||||
|
||||
struct phy_device *phy_device_create(struct mii_dev *bus, int addr,
|
||||
|
@ -859,7 +859,7 @@ int phy_reset(struct phy_device *phydev)
|
|||
|
||||
#ifdef CONFIG_PHYLIB_10G
|
||||
/* If it's 10G, we need to issue reset through one of the MMDs */
|
||||
if (is_10g_interface(phydev->interface)) {
|
||||
if (phydev->is_c45) {
|
||||
if (!phydev->mmds)
|
||||
gen10g_discover_mmds(phydev);
|
||||
|
||||
|
|
|
@ -359,18 +359,6 @@ static inline int phy_clear_bits_mmd(struct phy_device *phydev, int devad,
|
|||
|
||||
#ifdef CONFIG_PHYLIB_10G
|
||||
extern struct phy_driver gen10g_driver;
|
||||
|
||||
/*
|
||||
* List all 10G interfaces here, the assumption being that PHYs on these
|
||||
* interfaces are C45
|
||||
*/
|
||||
static inline int is_10g_interface(phy_interface_t interface)
|
||||
{
|
||||
return interface == PHY_INTERFACE_MODE_XGMII ||
|
||||
interface == PHY_INTERFACE_MODE_USXGMII ||
|
||||
interface == PHY_INTERFACE_MODE_10GBASER;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Reference in a new issue