diff options
| author | Tom Rini <trini@konsulko.com> | 2018-03-25 12:00:00 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-03-25 12:00:00 -0400 |
| commit | 89a650e0ffb89faaea1b9e6ad8cf2b38203435f2 (patch) | |
| tree | 4827f512e3c1e6f2887133bbb9cb3ee9497ba603 /drivers/net/zynq_gem.c | |
| parent | 423effc04a195ce6a464eadadfa7f765bf786889 (diff) | |
| parent | 8ae3d0b50cd22aebcd87022dc357d1cf0f3a879b (diff) | |
| download | u-boot-89a650e0ffb89faaea1b9e6ad8cf2b38203435f2.tar.gz | |
Merge tag 'xilinx-for-v2018.05' of git://git.denx.de/u-boot-microblaze
Xilinx changes for v2018.05
- Fix mkimage recognition
- Update all my fragments
ZynqMP:
- Use clk driver
- Support loading elfs in el1
- Various DTS and defconfig changes
- Enable newer pmufw versions
- Support more clocks
- Remove ep108
- Secure image support
- Fix memtest setup
Zynq:
- Enabling watchdog driver
- Support more clocks
- defconfig changes
fpga:
- Simplify error path
net:
- GMII case update
Diffstat (limited to 'drivers/net/zynq_gem.c')
| -rw-r--r-- | drivers/net/zynq_gem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index 2cc49bca92..1390c36c61 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -325,7 +325,8 @@ static int zynq_phy_init(struct udevice *dev) /* Enable only MDIO bus */ writel(ZYNQ_GEM_NWCTRL_MDEN_MASK, ®s->nwctrl); - if (priv->interface != PHY_INTERFACE_MODE_SGMII) { + if ((priv->interface != PHY_INTERFACE_MODE_SGMII) && + (priv->interface != PHY_INTERFACE_MODE_GMII)) { ret = phy_detection(dev); if (ret) { printf("GEM PHY init failed\n"); |