diff options
| author | Stephan Gatzka | 2017-08-22 14:25:07 +0200 |
|---|---|---|
| committer | David S. Miller | 2017-08-24 05:26:58 +0200 |
| commit | 013dae5dbc07aa521a38f1ca2d32123ec674bd5d (patch) | |
| tree | 72be30944ded6c80347ac4421b7faf870814bdbd /drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c | |
| parent | fsl/man: Inherit parent device and of_node (diff) | |
| download | kernel-qcow2-linux-013dae5dbc07aa521a38f1ca2d32123ec674bd5d.tar.gz kernel-qcow2-linux-013dae5dbc07aa521a38f1ca2d32123ec674bd5d.tar.xz kernel-qcow2-linux-013dae5dbc07aa521a38f1ca2d32123ec674bd5d.zip | |
net: stmmac: socfgpa: Ensure emac bit set in sys manager for MII/GMII/SGMII.
When using MII/GMII/SGMII in the Altera SoC, the phy needs to be
wired through the FPGA. To ensure correct behavior, the appropriate
bit in the System Manager FPGA Interface Group register needs to be
set.
Signed-off-by: Stephan Gatzka <stephan.gatzka@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c index 17d4bbaeb65c..6e359572b9f0 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c @@ -269,7 +269,10 @@ static int socfpga_dwmac_set_phy_mode(struct socfpga_dwmac *dwmac) ctrl &= ~(SYSMGR_EMACGRP_CTRL_PHYSEL_MASK << reg_shift); ctrl |= val << reg_shift; - if (dwmac->f2h_ptp_ref_clk) { + if (dwmac->f2h_ptp_ref_clk || + phymode == PHY_INTERFACE_MODE_MII || + phymode == PHY_INTERFACE_MODE_GMII || + phymode == PHY_INTERFACE_MODE_SGMII) { ctrl |= SYSMGR_EMACGRP_CTRL_PTP_REF_CLK_MASK << (reg_shift / 2); regmap_read(sys_mgr_base_addr, SYSMGR_FPGAGRP_MODULE_REG, &module); |