| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394 |
- From: Xo Wang <[email protected]>
- Date: Fri, 21 Oct 2016 10:20:13 -0700
- Subject: [PATCH] net: phy: broadcom: Add support for BCM54612E
- This PHY has internal delays enabled after reset. This clears the
- internal delay enables unless the interface specifically requests them.
- Signed-off-by: Xo Wang <[email protected]>
- Reviewed-by: Florian Fainelli <[email protected]>
- Reviewed-by: Joel Stanley <[email protected]>
- Signed-off-by: David S. Miller <[email protected]>
- ---
- --- a/drivers/net/phy/broadcom.c
- +++ b/drivers/net/phy/broadcom.c
- @@ -337,6 +337,41 @@ static int bcm5481_config_aneg(struct ph
- return ret;
- }
-
- +static int bcm54612e_config_aneg(struct phy_device *phydev)
- +{
- + int ret;
- +
- + /* First, auto-negotiate. */
- + ret = genphy_config_aneg(phydev);
- +
- + /* Clear TX internal delay unless requested. */
- + if ((phydev->interface != PHY_INTERFACE_MODE_RGMII_ID) &&
- + (phydev->interface != PHY_INTERFACE_MODE_RGMII_TXID)) {
- + /* Disable TXD to GTXCLK clock delay (default set) */
- + /* Bit 9 is the only field in shadow register 00011 */
- + bcm_phy_write_shadow(phydev, 0x03, 0);
- + }
- +
- + /* Clear RX internal delay unless requested. */
- + if ((phydev->interface != PHY_INTERFACE_MODE_RGMII_ID) &&
- + (phydev->interface != PHY_INTERFACE_MODE_RGMII_RXID)) {
- + u16 reg;
- +
- + /* Errata: reads require filling in the write selector field */
- + bcm54xx_auxctl_write(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC,
- + MII_BCM54XX_AUXCTL_MISC_RDSEL_MISC);
- + reg = phy_read(phydev, MII_BCM54XX_AUX_CTL);
- + /* Disable RXD to RXC delay (default set) */
- + reg &= ~MII_BCM54XX_AUXCTL_MISC_RXD_RXC_SKEW;
- + /* Clear shadow selector field */
- + reg &= ~MII_BCM54XX_AUXCTL_SHDWSEL_MASK;
- + bcm54xx_auxctl_write(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC,
- + MII_BCM54XX_AUXCTL_MISC_WREN | reg);
- + }
- +
- + return ret;
- +}
- +
- static int brcm_phy_setbits(struct phy_device *phydev, int reg, int set)
- {
- int val;
- @@ -485,6 +520,18 @@ static struct phy_driver broadcom_driver
- .ack_interrupt = bcm_phy_ack_intr,
- .config_intr = bcm_phy_config_intr,
- }, {
- + .phy_id = PHY_ID_BCM54612E,
- + .phy_id_mask = 0xfffffff0,
- + .name = "Broadcom BCM54612E",
- + .features = PHY_GBIT_FEATURES |
- + SUPPORTED_Pause | SUPPORTED_Asym_Pause,
- + .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
- + .config_init = bcm54xx_config_init,
- + .config_aneg = bcm54612e_config_aneg,
- + .read_status = genphy_read_status,
- + .ack_interrupt = bcm_phy_ack_intr,
- + .config_intr = bcm_phy_config_intr,
- +}, {
- .phy_id = PHY_ID_BCM54616S,
- .phy_id_mask = 0xfffffff0,
- .name = "Broadcom BCM54616S",
- @@ -600,6 +647,7 @@ static struct mdio_device_id __maybe_unu
- { PHY_ID_BCM5411, 0xfffffff0 },
- { PHY_ID_BCM5421, 0xfffffff0 },
- { PHY_ID_BCM5461, 0xfffffff0 },
- + { PHY_ID_BCM54612E, 0xfffffff0 },
- { PHY_ID_BCM54616S, 0xfffffff0 },
- { PHY_ID_BCM5464, 0xfffffff0 },
- { PHY_ID_BCM5481, 0xfffffff0 },
- --- a/include/linux/brcmphy.h
- +++ b/include/linux/brcmphy.h
- @@ -18,6 +18,7 @@
- #define PHY_ID_BCM5421 0x002060e0
- #define PHY_ID_BCM5464 0x002060b0
- #define PHY_ID_BCM5461 0x002060c0
- +#define PHY_ID_BCM54612E 0x03625e60
- #define PHY_ID_BCM54616S 0x03625d10
- #define PHY_ID_BCM57780 0x03625d90
-
|
