diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-05-18 07:27:33 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-10-23 09:24:05 +0200 |
| commit | cf40770bdc33482d769e6154e0ffbc2e156d9a1e (patch) | |
| tree | caac2c35f19a60e2ba833aceb8f0ad843ae64b74 /linux/drivers/net/ethernet/freescale/fman/fman_memac.c | |
| parent | qbman: Fix platform_get_irq() error checks (diff) | |
| download | rtems-libbsd-cf40770bdc33482d769e6154e0ffbc2e156d9a1e.tar.bz2 | |
Linux update to 4.12-rc1+
Linux baseline b23afd384801711ab6dbccd259cc14cb09a1dcaf.
Diffstat (limited to 'linux/drivers/net/ethernet/freescale/fman/fman_memac.c')
| -rw-r--r-- | linux/drivers/net/ethernet/freescale/fman/fman_memac.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/linux/drivers/net/ethernet/freescale/fman/fman_memac.c b/linux/drivers/net/ethernet/freescale/fman/fman_memac.c index bc4dfb18..e40fd11d 100644 --- a/linux/drivers/net/ethernet/freescale/fman/fman_memac.c +++ b/linux/drivers/net/ethernet/freescale/fman/fman_memac.c @@ -447,7 +447,10 @@ static int init(struct memac_regs __iomem *regs, struct memac_cfg *cfg, break; default: tmp |= IF_MODE_GMII; - if (phy_if == PHY_INTERFACE_MODE_RGMII) + if (phy_if == PHY_INTERFACE_MODE_RGMII || + phy_if == PHY_INTERFACE_MODE_RGMII_ID || + phy_if == PHY_INTERFACE_MODE_RGMII_RXID || + phy_if == PHY_INTERFACE_MODE_RGMII_TXID) tmp |= IF_MODE_RGMII | IF_MODE_RGMII_AUTO; } iowrite32be(tmp, ®s->if_mode); |