aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Stübner <heiko@sntech.de>2015-06-21 15:52:52 -0400
committerDavid S. Miller <davem@davemloft.net>2015-06-23 09:49:24 -0400
commitc48fa33c1fb2ccdb4bcc863a7b841f11efe0f8b0 (patch)
treeda1b29cf76314a9cc9a0163040c1cef4bd577e03
parent059dab08334b2af9cb8f7659536943416408a09d (diff)
net: stmmac: dwmac-rk: Fix clk rate when provided by soc
The first iteration of the dwmac-rk support did access an intermediate clock directly below the pll selector. This was removed in a subsequent revision, but the clock and one invocation remained. This results in the driver trying to set the rate of a non-existent clock when the soc and not some external source provides the phy clock for RMII phys. So set the rate of the correct clock and remove the remaining now completely unused definition. Fixes: 436f5ae08f9d ("GMAC: add driver for Rockchip RK3288 SoCs integrated GMAC") Cc: stable@vger.kernel.org Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
index a39607085281..5dafebb94fa4 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
@@ -42,7 +42,6 @@ struct rk_priv_data {
42 bool clock_input; 42 bool clock_input;
43 43
44 struct clk *clk_mac; 44 struct clk *clk_mac;
45 struct clk *clk_mac_pll;
46 struct clk *gmac_clkin; 45 struct clk *gmac_clkin;
47 struct clk *mac_clk_rx; 46 struct clk *mac_clk_rx;
48 struct clk *mac_clk_tx; 47 struct clk *mac_clk_tx;
@@ -209,7 +208,7 @@ static int gmac_clk_init(struct rk_priv_data *bsp_priv)
209 dev_info(dev, "clock input from PHY\n"); 208 dev_info(dev, "clock input from PHY\n");
210 } else { 209 } else {
211 if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) 210 if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII)
212 clk_set_rate(bsp_priv->clk_mac_pll, 50000000); 211 clk_set_rate(bsp_priv->clk_mac, 50000000);
213 } 212 }
214 213
215 return 0; 214 return 0;