Commit 6c806720 authored by Dimitri Fedrau's avatar Dimitri Fedrau Committed by Paolo Abeni
Browse files

net: phy: marvell-88q2xxx: enable temperature sensor in mv88q2xxx_config_init 



Temperature sensor gets enabled for 88Q222X devices in
mv88q222x_config_init. Move enabling to mv88q2xxx_config_init because
all 88Q2XXX devices support the temperature sensor.

Signed-off-by: default avatarDimitri Fedrau <dima.fedrau@gmail.com>
Tested-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent cbe0449e

drivers/net/phy/marvell-88q2xxx.c

+9 −12
Original line number Diff line number Diff line
@@ -513,6 +513,15 @@ static int mv88q2xxx_config_init(struct phy_device *phydev) 
			return ret;

	}



	/* Enable temperature sense */

	if (priv->enable_temp) {

		ret = phy_modify_mmd(phydev, MDIO_MMD_PCS,

				     MDIO_MMD_PCS_MV_TEMP_SENSOR2,

				     MDIO_MMD_PCS_MV_TEMP_SENSOR2_DIS_MASK, 0);

		if (ret < 0)

			return ret;

	}



	return 0;

}
@@ -903,18 +912,6 @@ static int mv88q222x_revb1_revb2_config_init(struct phy_device *phydev) 


static int mv88q222x_config_init(struct phy_device *phydev)

{

	struct mv88q2xxx_priv *priv = phydev->priv;

	int ret;



	/* Enable temperature sense */

	if (priv->enable_temp) {

		ret = phy_modify_mmd(phydev, MDIO_MMD_PCS,

				     MDIO_MMD_PCS_MV_TEMP_SENSOR2,

				     MDIO_MMD_PCS_MV_TEMP_SENSOR2_DIS_MASK, 0);

		if (ret < 0)

			return ret;

	}



	if (phydev->c45_ids.device_ids[MDIO_MMD_PMAPMD] == PHY_ID_88Q2220_REVB0)

		return mv88q222x_revb0_config_init(phydev);

	else