Commit 3feb9b23 authored by Maxime Chevallier's avatar Maxime Chevallier Committed by David S. Miller
Browse files

net: phy: Move of_set_phy_eee_broken to phy-core.c 



Since of_set_phy_supported was moved to phy-core.c, we can also move
of_set_phy_eee_broken to the same location, so that we have all OF
functions in the same place.

This patch doesn't intend to introduce any change in behaviour.

Signed-off-by: default avatarMaxime Chevallier <maxime.chevallier@bootlin.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a4eaed9f

drivers/net/phy/phy-core.c

+27 −0
Original line number Diff line number Diff line
@@ -383,6 +383,33 @@ void of_set_phy_supported(struct phy_device *phydev) 
		__set_phy_supported(phydev, max_speed);

}



void of_set_phy_eee_broken(struct phy_device *phydev)

{

	struct device_node *node = phydev->mdio.dev.of_node;

	u32 broken = 0;



	if (!IS_ENABLED(CONFIG_OF_MDIO))

		return;



	if (!node)

		return;



	if (of_property_read_bool(node, "eee-broken-100tx"))

		broken |= MDIO_EEE_100TX;

	if (of_property_read_bool(node, "eee-broken-1000t"))

		broken |= MDIO_EEE_1000T;

	if (of_property_read_bool(node, "eee-broken-10gt"))

		broken |= MDIO_EEE_10GT;

	if (of_property_read_bool(node, "eee-broken-1000kx"))

		broken |= MDIO_EEE_1000KX;

	if (of_property_read_bool(node, "eee-broken-10gkx4"))

		broken |= MDIO_EEE_10GKX4;

	if (of_property_read_bool(node, "eee-broken-10gkr"))

		broken |= MDIO_EEE_10GKR;



	phydev->eee_broken_modes = broken;

}



/**

 * phy_resolve_aneg_linkmode - resolve the advertisements into phy settings

 * @phydev: The phy_device struct

drivers/net/phy/phy_device.c

+0 −28
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include <linux/mdio.h>

#include <linux/io.h>

#include <linux/uaccess.h>

#include <linux/of.h>



MODULE_DESCRIPTION("PHY library");

MODULE_AUTHOR("Andy Fleming");
@@ -2079,33 +2078,6 @@ bool phy_validate_pause(struct phy_device *phydev, 
}

EXPORT_SYMBOL(phy_validate_pause);



static void of_set_phy_eee_broken(struct phy_device *phydev)

{

	struct device_node *node = phydev->mdio.dev.of_node;

	u32 broken = 0;



	if (!IS_ENABLED(CONFIG_OF_MDIO))

		return;



	if (!node)

		return;



	if (of_property_read_bool(node, "eee-broken-100tx"))

		broken |= MDIO_EEE_100TX;

	if (of_property_read_bool(node, "eee-broken-1000t"))

		broken |= MDIO_EEE_1000T;

	if (of_property_read_bool(node, "eee-broken-10gt"))

		broken |= MDIO_EEE_10GT;

	if (of_property_read_bool(node, "eee-broken-1000kx"))

		broken |= MDIO_EEE_1000KX;

	if (of_property_read_bool(node, "eee-broken-10gkx4"))

		broken |= MDIO_EEE_10GKX4;

	if (of_property_read_bool(node, "eee-broken-10gkr"))

		broken |= MDIO_EEE_10GKR;



	phydev->eee_broken_modes = broken;

}



static bool phy_drv_supports_irq(struct phy_driver *phydrv)

{

	return phydrv->config_intr && phydrv->ack_interrupt;

include/linux/phy.h

+1 −0
Original line number Diff line number Diff line
@@ -674,6 +674,7 @@ phy_lookup_setting(int speed, int duplex, const unsigned long *mask, 
size_t phy_speeds(unsigned int *speeds, size_t size,

		  unsigned long *mask);

void of_set_phy_supported(struct phy_device *phydev);

void of_set_phy_eee_broken(struct phy_device *phydev);



static inline bool __phy_is_started(struct phy_device *phydev)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE