Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'phy_rgmii' 



Florian Fainelli says:

====================
net: phy: phy_interface_is_rgmii helper

As you suggested, here is the helper function to avoid missing some RGMII
interface checks. Had to wait for net to be merged in net-next to avoid
submitting the same patch/commit.

Dan, you might want to rebase your dp83867 submission to use that helper
when you this patchset gets merged into net-next, thanks!
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ffa915d0 32a64161

drivers/net/phy/icplus.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -139,10 +139,7 @@ static int ip1001_config_init(struct phy_device *phydev) 
	if (c < 0)

	if (c < 0)

		return c;

		return c;





	if ((phydev->interface == PHY_INTERFACE_MODE_RGMII) ||

	if (phy_interface_is_rgmii(phydev)) {

	    (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) ||

	    (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) ||

	    (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)) {





		c = phy_read(phydev, IP10XX_SPEC_CTRL_STATUS);

		c = phy_read(phydev, IP10XX_SPEC_CTRL_STATUS);

		if (c < 0)

		if (c < 0)

drivers/net/phy/marvell.c

+2 −8
Original line number Original line Diff line number Diff line
@@ -317,10 +317,7 @@ static int m88e1121_config_aneg(struct phy_device *phydev) 
	if (err < 0)

	if (err < 0)

		return err;

		return err;





	if ((phydev->interface == PHY_INTERFACE_MODE_RGMII) ||

	if (phy_interface_is_rgmii(phydev)) {

	    (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) ||

	    (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) ||

	    (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)) {





		mscr = phy_read(phydev, MII_88E1121_PHY_MSCR_REG) &

		mscr = phy_read(phydev, MII_88E1121_PHY_MSCR_REG) &

			MII_88E1121_PHY_MSCR_DELAY_MASK;

			MII_88E1121_PHY_MSCR_DELAY_MASK;
@@ -469,10 +466,7 @@ static int m88e1111_config_init(struct phy_device *phydev) 
	int err;

	int err;

	int temp;

	int temp;





	if ((phydev->interface == PHY_INTERFACE_MODE_RGMII) ||

	if (phy_interface_is_rgmii(phydev)) {

	    (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) ||

	    (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) ||

	    (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)) {





		temp = phy_read(phydev, MII_M1111_PHY_EXT_CR);

		temp = phy_read(phydev, MII_M1111_PHY_EXT_CR);

		if (temp < 0)

		if (temp < 0)

drivers/net/phy/phy.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -1093,8 +1093,7 @@ int phy_init_eee(struct phy_device *phydev, bool clk_stop_enable) 
	if ((phydev->duplex == DUPLEX_FULL) &&

	if ((phydev->duplex == DUPLEX_FULL) &&

	    ((phydev->interface == PHY_INTERFACE_MODE_MII) ||

	    ((phydev->interface == PHY_INTERFACE_MODE_MII) ||

	    (phydev->interface == PHY_INTERFACE_MODE_GMII) ||

	    (phydev->interface == PHY_INTERFACE_MODE_GMII) ||

	    (phydev->interface >= PHY_INTERFACE_MODE_RGMII &&

	     phy_interface_is_rgmii(phydev) ||

	     phydev->interface <= PHY_INTERFACE_MODE_RGMII_TXID) ||

	     phy_is_internal(phydev))) {

	     phy_is_internal(phydev))) {

		int eee_lp, eee_cap, eee_adv;

		int eee_lp, eee_cap, eee_adv;

		u32 lp, cap, adv;

		u32 lp, cap, adv;

include/linux/phy.h

+11 −0
Original line number Original line Diff line number Diff line
@@ -677,6 +677,17 @@ static inline bool phy_is_internal(struct phy_device *phydev) 
	return phydev->is_internal;

	return phydev->is_internal;

}

}





/**

 * phy_interface_is_rgmii - Convenience function for testing if a PHY interface

 * is RGMII (all variants)

 * @phydev: the phy_device struct

 */

static inline bool phy_interface_is_rgmii(struct phy_device *phydev)

{

	return phydev->interface >= PHY_INTERFACE_MODE_RGMII &&

		phydev->interface <= PHY_INTERFACE_MODE_RGMII_TXID;

}



/**

/**

 * phy_write_mmd - Convenience function for writing a register

 * phy_write_mmd - Convenience function for writing a register

 * on an MMD on a given PHY.

 * on an MMD on a given PHY.