Commit ba3823ca authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'Fixes-for-OF_MDIO-flag' 



Dan Murphy says:

====================
Fixes for OF_MDIO flag

There are some residual drivers that check the CONFIG_OF_MDIO flag using the
if defs. Using this check does not work when the OF_MDIO is configured as a
module. Using the IS_ENABLED macro checks if the flag is declared as built-in
or as a module.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e2243720 ae602786

drivers/net/phy/dp83867.c

+1 −1
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ static int dp83867_verify_rgmii_cfg(struct phy_device *phydev) 
	return 0;

}



#ifdef CONFIG_OF_MDIO

#if IS_ENABLED(CONFIG_OF_MDIO)

static int dp83867_of_init(struct phy_device *phydev)

{

	struct dp83867_private *dp83867 = phydev->priv;

drivers/net/phy/dp83869.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static int dp83869_set_strapped_mode(struct phy_device *phydev) 
	return 0;

}



#ifdef CONFIG_OF_MDIO

#if IS_ENABLED(CONFIG_OF_MDIO)

static int dp83869_of_init(struct phy_device *phydev)

{

	struct dp83869_private *dp83869 = phydev->priv;

drivers/net/phy/marvell.c

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ static int m88e1101_config_aneg(struct phy_device *phydev) 
	return marvell_config_aneg(phydev);

}



#ifdef CONFIG_OF_MDIO

#if IS_ENABLED(CONFIG_OF_MDIO)

/* Set and/or override some configuration registers based on the

 * marvell,reg-init property stored in the of_node for the phydev.

 *

drivers/net/phy/mscc/mscc.h

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ struct vsc8531_private { 
#endif

};



#ifdef CONFIG_OF_MDIO

#if IS_ENABLED(CONFIG_OF_MDIO)

struct vsc8531_edge_rate_table {

	u32 vddmac;

	u32 slowdown[8];

drivers/net/phy/mscc/mscc_main.c

+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static const struct vsc85xx_hw_stat vsc8584_hw_stats[] = { 
	},

};



#ifdef CONFIG_OF_MDIO

#if IS_ENABLED(CONFIG_OF_MDIO)

static const struct vsc8531_edge_rate_table edge_table[] = {

	{MSCC_VDDMAC_3300, { 0, 2,  4,  7, 10, 17, 29, 53} },

	{MSCC_VDDMAC_2500, { 0, 3,  6, 10, 14, 23, 37, 63} },
@@ -382,7 +382,7 @@ out_unlock: 
	mutex_unlock(&phydev->lock);

}



#ifdef CONFIG_OF_MDIO

#if IS_ENABLED(CONFIG_OF_MDIO)

static int vsc85xx_edge_rate_magic_get(struct phy_device *phydev)

{

	u32 vdd, sd;

CRA Git | Maintained and supported by SUSTech CRA and CCSE