diff options
| author | Tom Rini <trini@konsulko.com> | 2021-04-05 11:29:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-04-05 11:29:57 -0400 |
| commit | 90eba245a66aa20589404ba537215faf2012c1a3 (patch) | |
| tree | c581cd1f00dd162aeac4262bb4e74c2a9fea98c9 /drivers/net/zynq_gem.c | |
| parent | b46dd116ce03e235f2a7d4843c6278e1da44b5e1 (diff) | |
| parent | db8b46120aed6554d1ff405260ea6d2cc2439fcc (diff) | |
| download | u-boot-90eba245a66aa20589404ba537215faf2012c1a3.zip u-boot-90eba245a66aa20589404ba537215faf2012c1a3.tar.gz u-boot-90eba245a66aa20589404ba537215faf2012c1a3.tar.bz2 | |
Merge branch 'next'
Diffstat (limited to 'drivers/net/zynq_gem.c')
| -rw-r--r-- | drivers/net/zynq_gem.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index baf06a2..ff59982 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -454,14 +454,6 @@ static int zynq_gem_init(struct udevice *dev) priv->int_pcs) { nwconfig |= ZYNQ_GEM_NWCFG_SGMII_ENBL | ZYNQ_GEM_NWCFG_PCS_SEL; -#ifdef CONFIG_ARM64 - if (priv->phydev->phy_id != PHY_FIXED_ID) - writel(readl(®s->pcscntrl) | ZYNQ_GEM_PCS_CTL_ANEG_ENBL, - ®s->pcscntrl); - else - writel(readl(®s->pcscntrl) & ~ZYNQ_GEM_PCS_CTL_ANEG_ENBL, - ®s->pcscntrl); -#endif } switch (priv->phydev->speed) { @@ -480,6 +472,23 @@ static int zynq_gem_init(struct udevice *dev) break; } +#ifdef CONFIG_ARM64 + if (priv->interface == PHY_INTERFACE_MODE_SGMII && + priv->int_pcs) { + /* + * Disable AN for fixed link configuration, enable otherwise. + * Must be written after PCS_SEL is set in nwconfig, + * otherwise writes will not take effect. + */ + if (priv->phydev->phy_id != PHY_FIXED_ID) + writel(readl(®s->pcscntrl) | ZYNQ_GEM_PCS_CTL_ANEG_ENBL, + ®s->pcscntrl); + else + writel(readl(®s->pcscntrl) & ~ZYNQ_GEM_PCS_CTL_ANEG_ENBL, + ®s->pcscntrl); + } +#endif + ret = clk_set_rate(&priv->tx_clk, clk_rate); if (IS_ERR_VALUE(ret)) { dev_err(dev, "failed to set tx clock rate\n"); |