diff options
author | Biao Huang <biao.huang@mediatek.com> | 2019-05-24 14:26:08 +0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-05-25 11:02:31 -0700 |
commit | 5e7f7fc538d894b2d9aa41876b8dcf35f5fe11e6 (patch) | |
tree | 9b05f3100a9355e57ce02e1f94ee73e8a65a314d /drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | |
parent | net: stmmac: update rx tail pointer register to fix rx dma hang issue. (diff) | |
download | linux-dev-5e7f7fc538d894b2d9aa41876b8dcf35f5fe11e6.tar.xz linux-dev-5e7f7fc538d894b2d9aa41876b8dcf35f5fe11e6.zip |
net: stmmac: fix csr_clk can't be zero issue
The specific clk_csr value can be zero, and
stmmac_clk is necessary for MDC clock which can be set dynamically.
So, change the condition from plat->clk_csr to plat->stmmac_clk to
fix clk_csr can't be zero issue.
Fixes: cd7201f477b9 ("stmmac: MDC clock dynamically based on the csr clock input")
Signed-off-by: Biao Huang <biao.huang@mediatek.com>
Acked-by: Alexandre TORGUE <alexandre.torgue@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
-rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index 3031f2bf15d6..f45bfbef97d0 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -408,7 +408,10 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac) /* Default to phy auto-detection */ plat->phy_addr = -1; - /* Get clk_csr from device tree */ + /* Default to get clk_csr from stmmac_clk_crs_set(), + * or get clk_csr from device tree. + */ + plat->clk_csr = -1; of_property_read_u32(np, "clk_csr", &plat->clk_csr); /* "snps,phy-addr" is not a standard property. Mark it as deprecated |