X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=drivers%2Fnet%2Fethernet%2Fstmicro%2Fstmmac%2Fstmmac_main.c;h=ff18bc0378225954788831843f0abe8b76bd9e47;hb=2ae05321496aa27767bc33a5cc19451b3db67919;hp=e2305197ad49645874b2ba9e2a1fb7bae1181769;hpb=ac94e80d6a3cec1b1b08640772f8b3f0a1d5c35b;p=firefly-linux-kernel-4.4.55.git diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index e2305197ad49..ff18bc037822 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -165,7 +165,8 @@ static void stmmac_clk_csr_set(struct stmmac_priv *priv) { u32 clk_rate; - clk_rate = clk_get_rate(priv->stmmac_clk); + //clk_rate = clk_get_rate(priv->stmmac_clk); + clk_rate = clk_get_rate(priv->pclk); /* Platform provided default clk_csr would be assumed valid * for all other cases except for the below mentioned ones. @@ -2886,7 +2887,8 @@ int stmmac_dvr_probe(struct device *device, } clk_prepare_enable(priv->stmmac_clk); - priv->pclk = devm_clk_get(priv->device, "pclk"); + //priv->pclk = devm_clk_get(priv->device, "pclk"); + priv->pclk = devm_clk_get(priv->device, "pclk_mac"); if (IS_ERR(priv->pclk)) { if (PTR_ERR(priv->pclk) == -EPROBE_DEFER) { ret = -EPROBE_DEFER;