summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorIcenowy Zheng <icenowy@aosc.io>2019-06-20 15:47:44 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-07-26 09:14:11 +0200
commit41864adfee2e8aebf695b053a0738bb08aee4b31 (patch)
tree7244eb159605aaa561787b5ea3a0fa63b5456465 /drivers
parentbce037abc29f37c88f78be8f893976a7145b4fc3 (diff)
downloadlinux-stable-41864adfee2e8aebf695b053a0738bb08aee4b31.tar.gz
linux-stable-41864adfee2e8aebf695b053a0738bb08aee4b31.tar.bz2
linux-stable-41864adfee2e8aebf695b053a0738bb08aee4b31.zip
net: stmmac: sun8i: force select external PHY when no internal one
[ Upstream commit 0fec7e72ae1391bb2d7527efb54fe6ae88acabce ] The PHY selection bit also exists on SoCs without an internal PHY; if it's set to 1 (internal PHY, default value) then the MAC will not make use of any PHY on such SoCs. This problem appears when adapting for H6, which has no real internal PHY (the "internal PHY" on H6 is not on-die, but on a co-packaged AC200 chip, connected via RMII interface at GPIO bank A). Force the PHY selection bit to 0 when the SOC doesn't have an internal PHY, to address the problem of a wrong default value. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Signed-off-by: Ondrej Jirman <megous@megous.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
index 49a896a16391..79c91526f3ec 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
@@ -893,6 +893,11 @@ static int sun8i_dwmac_set_syscon(struct stmmac_priv *priv)
* address. No need to mask it again.
*/
reg |= 1 << H3_EPHY_ADDR_SHIFT;
+ } else {
+ /* For SoCs without internal PHY the PHY selection bit should be
+ * set to 0 (external PHY).
+ */
+ reg &= ~H3_EPHY_SELECT;
}
if (!of_property_read_u32(node, "allwinner,tx-delay-ps", &val)) {