Commit 31d00ca4 authored by Michael Walle's avatar Michael Walle Committed by Jakub Kicinski
Browse files

net: phy: micrel: move the PHY timestamping check 



Both lan8814_ptp_init() and lan8814_ptp_probe_once() are only used if
PTP and PHY timestamping is enabed. Up until now the probe function just
returns early, if they are not needed. But we need the
phy_package_init_once() functionality for the coma mode GPIO setup. Move
the check into the functions itself.

Signed-off-by: default avatarMichael Walle <michael@walle.cc>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 749c61e5

drivers/net/phy/micrel.c

+8 −4
Original line number Diff line number Diff line
@@ -2729,6 +2729,10 @@ static void lan8814_ptp_init(struct phy_device *phydev) 
	struct kszphy_ptp_priv *ptp_priv = &priv->ptp_priv;

	u32 temp;



	if (!IS_ENABLED(CONFIG_PTP_1588_CLOCK) ||

	    !IS_ENABLED(CONFIG_NETWORK_PHY_TIMESTAMPING))

		return;



	lanphy_write_page_reg(phydev, 5, TSU_HARD_RESET, TSU_HARD_RESET_);



	temp = lanphy_read_page_reg(phydev, 5, PTP_TX_MOD);
@@ -2767,6 +2771,10 @@ static int lan8814_ptp_probe_once(struct phy_device *phydev) 
{

	struct lan8814_shared_priv *shared = phydev->shared->priv;



	if (!IS_ENABLED(CONFIG_PTP_1588_CLOCK) ||

	    !IS_ENABLED(CONFIG_NETWORK_PHY_TIMESTAMPING))

		return 0;



	/* Initialise shared lock for clock*/

	mutex_init(&shared->shared_lock);
@@ -2843,10 +2851,6 @@ static int lan8814_probe(struct phy_device *phydev) 


	phydev->priv = priv;



	if (!IS_ENABLED(CONFIG_PTP_1588_CLOCK) ||

	    !IS_ENABLED(CONFIG_NETWORK_PHY_TIMESTAMPING))

		return 0;



	/* Strap-in value for PHY address, below register read gives starting

	 * phy address value

	 */