Commit 5519da87 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: phy: broadcom: Move bcm54xx_auxctl_{read, write} to common library 



We are going to need these functions to implement support for Broadcom
Wirespeed, aka downshift.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f8071cde

drivers/net/phy/bcm-phy-lib.c

+17 −0
Original line number Diff line number Diff line
@@ -50,6 +50,23 @@ int bcm_phy_read_exp(struct phy_device *phydev, u16 reg) 
}

EXPORT_SYMBOL_GPL(bcm_phy_read_exp);



int bcm54xx_auxctl_read(struct phy_device *phydev, u16 regnum)

{

	/* The register must be written to both the Shadow Register Select and

	 * the Shadow Read Register Selector

	 */

	phy_write(phydev, MII_BCM54XX_AUX_CTL, regnum |

		  regnum << MII_BCM54XX_AUXCTL_SHDWSEL_READ_SHIFT);

	return phy_read(phydev, MII_BCM54XX_AUX_CTL);

}

EXPORT_SYMBOL_GPL(bcm54xx_auxctl_read);



int bcm54xx_auxctl_write(struct phy_device *phydev, u16 regnum, u16 val)

{

	return phy_write(phydev, MII_BCM54XX_AUX_CTL, regnum | val);

}

EXPORT_SYMBOL(bcm54xx_auxctl_write);



int bcm_phy_write_misc(struct phy_device *phydev,

		       u16 reg, u16 chl, u16 val)

{

drivers/net/phy/bcm-phy-lib.h

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ 
int bcm_phy_write_exp(struct phy_device *phydev, u16 reg, u16 val);

int bcm_phy_read_exp(struct phy_device *phydev, u16 reg);



int bcm54xx_auxctl_write(struct phy_device *phydev, u16 regnum, u16 val);

int bcm54xx_auxctl_read(struct phy_device *phydev, u16 regnum);



int bcm_phy_write_misc(struct phy_device *phydev,

		       u16 reg, u16 chl, u16 value);

int bcm_phy_read_misc(struct phy_device *phydev,

drivers/net/phy/broadcom.c

+0 −15
Original line number Diff line number Diff line
@@ -30,21 +30,6 @@ MODULE_DESCRIPTION("Broadcom PHY driver"); 
MODULE_AUTHOR("Maciej W. Rozycki");

MODULE_LICENSE("GPL");



static int bcm54xx_auxctl_read(struct phy_device *phydev, u16 regnum)

{

	/* The register must be written to both the Shadow Register Select and

	 * the Shadow Read Register Selector

	 */

	phy_write(phydev, MII_BCM54XX_AUX_CTL, regnum |

		  regnum << MII_BCM54XX_AUXCTL_SHDWSEL_READ_SHIFT);

	return phy_read(phydev, MII_BCM54XX_AUX_CTL);

}



static int bcm54xx_auxctl_write(struct phy_device *phydev, u16 regnum, u16 val)

{

	return phy_write(phydev, MII_BCM54XX_AUX_CTL, regnum | val);

}



static int bcm54810_config(struct phy_device *phydev)

{

	int rc, val;