Commit 46ba03c5 authored by Jose Abreu's avatar Jose Abreu Committed by Greg Kroah-Hartman

net: stmmac: Fallback to Platform Data clock in Watchdog conversion

[ Upstream commit 4ec5302f ]

If we don't have DT then stmmac_clk will not be available. Let's add a
new Platform Data field so that we can specify the refclk by this mean.

This way we can still use the coalesce command in PCI based setups.
Signed-off-by: default avatarJose Abreu <joabreu@synopsys.com>
Cc: Joao Pinto <jpinto@synopsys.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8096bc39
...@@ -719,8 +719,11 @@ static u32 stmmac_usec2riwt(u32 usec, struct stmmac_priv *priv) ...@@ -719,8 +719,11 @@ static u32 stmmac_usec2riwt(u32 usec, struct stmmac_priv *priv)
{ {
unsigned long clk = clk_get_rate(priv->plat->stmmac_clk); unsigned long clk = clk_get_rate(priv->plat->stmmac_clk);
if (!clk) if (!clk) {
return 0; clk = priv->plat->clk_ref_rate;
if (!clk)
return 0;
}
return (usec * (clk / 1000000)) / 256; return (usec * (clk / 1000000)) / 256;
} }
...@@ -729,8 +732,11 @@ static u32 stmmac_riwt2usec(u32 riwt, struct stmmac_priv *priv) ...@@ -729,8 +732,11 @@ static u32 stmmac_riwt2usec(u32 riwt, struct stmmac_priv *priv)
{ {
unsigned long clk = clk_get_rate(priv->plat->stmmac_clk); unsigned long clk = clk_get_rate(priv->plat->stmmac_clk);
if (!clk) if (!clk) {
return 0; clk = priv->plat->clk_ref_rate;
if (!clk)
return 0;
}
return (riwt * 256) / (clk / 1000000); return (riwt * 256) / (clk / 1000000);
} }
......
...@@ -184,6 +184,7 @@ struct plat_stmmacenet_data { ...@@ -184,6 +184,7 @@ struct plat_stmmacenet_data {
struct clk *pclk; struct clk *pclk;
struct clk *clk_ptp_ref; struct clk *clk_ptp_ref;
unsigned int clk_ptp_rate; unsigned int clk_ptp_rate;
unsigned int clk_ref_rate;
struct reset_control *stmmac_rst; struct reset_control *stmmac_rst;
struct stmmac_axi *axi; struct stmmac_axi *axi;
int has_gmac4; int has_gmac4;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment