ARM64: DTS: Fix Firefly board audio driver

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / stmicro / stmmac / stmmac_main.c

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index e2305197ad49645874b2ba9e2a1fb7bae1181769..ff18bc0378225954788831843f0abe8b76bd9e47 100644 (file)
--- 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;