Skip to contentSkip to conversation

Patch "net: stmmac: dwmac-rk: Fix clk rate when provided by soc" has been added to the 4.1-stable tree

PATCH [email protected] 1 participant 1 message Sep 26, 2015

Subsystems (5)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

net: stmmac: dwmac-rk: Fix clk rate when provided by soc

to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
net-stmmac-dwmac-rk-fix-clk-rate-when-provided-by-soc.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From c48fa33c1fb2ccdb4bcc863a7b841f11efe0f8b0 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Heiko=20St=C3=BCbner?= <[email protected]>
Date: Sun, 21 Jun 2015 21:52:52 +0200
Subject: net: stmmac: dwmac-rk: Fix clk rate when provided by soc

From: =?UTF-8?q?Heiko=20St=C3=BCbner?= <[email protected]>

commit c48fa33c1fb2ccdb4bcc863a7b841f11efe0f8b0 upstream.

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")
---
 drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +1 -2
@@ -38,7 +38,6 @@ struct rk_priv_data {
 	bool clock_input;
 
 	struct clk *clk_mac;
-	struct clk *clk_mac_pll;
 	struct clk *gmac_clkin;
 	struct clk *mac_clk_rx;
 	struct clk *mac_clk_tx;
@@ -208,7 +207,7 @@ static int gmac_clk_init(struct rk_priv_
 		dev_info(dev, "%s: clock input from PHY\n", __func__);
 	} else {
 		if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII)
-			clk_set_rate(bsp_priv->clk_mac_pll, 50000000);
+			clk_set_rate(bsp_priv->clk_mac, 50000000);
 	}
 
 	return 0;

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/net-stmmac-dwmac-rk-fix-clk-rate-when-provided-by-soc.patch