ASoC: fsl_spdif: Fix clock source for rxclk rate measurement

The rxclk rate actually uses sysclk, ipg clock for example, as its
reference clock to calculate it. But the driver currently doesn't
pass a correct clock source. So fix it.

Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit 0b8643900a1bff32ad8bf17ef1f5d57b6d490502)

diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c
index e2836b3f6998ee6608bec37555d25345bce3f00c..e7be6b3214e55aa34e81b1e6331e88c706dd0eaf 100644 (file)
--- a/sound/soc/fsl/fsl_spdif.c
+++ b/sound/soc/fsl/fsl_spdif.c
@@ -81,6 +81,7 @@ struct fsl_spdif_priv {
        struct clk *txclk[SPDIF_TXRATE_MAX];
        struct clk *rxclk;
        struct clk *coreclk;
+       struct clk *sysclk;
        struct snd_dmaengine_dai_dma_data dma_params_tx;
        struct snd_dmaengine_dai_dma_data dma_params_rx;
 
@@ -767,7 +768,7 @@ static int spdif_get_rxclk_rate(struct fsl_spdif_priv *spdif_priv,
        clksrc = (phaseconf >> SRPC_CLKSRC_SEL_OFFSET) & 0xf;
        if (srpc_dpll_locked[clksrc] && (phaseconf & SRPC_DPLL_LOCKED)) {
                /* Get bus clock from system */
-               busclk_freq = clk_get_rate(spdif_priv->rxclk);
+               busclk_freq = clk_get_rate(spdif_priv->sysclk);
        }
 
        /* FreqMeas_CLK = (BUS_CLK * FreqMeas) / 2 ^ 10 / GAINSEL / 128 */
@@ -1147,6 +1148,13 @@ static int fsl_spdif_probe(struct platform_device *pdev)
                return ret;
        }
 
+       /* Get system clock for rx clock rate calculation */
+       spdif_priv->sysclk = devm_clk_get(&pdev->dev, "rxtx5");
+       if (IS_ERR(spdif_priv->sysclk)) {
+               dev_err(&pdev->dev, "no sys clock (rxtx5) in devicetree\n");
+               return PTR_ERR(spdif_priv->sysclk);
+       }
+
        /* Get core clock for data register access via DMA */
        spdif_priv->coreclk = devm_clk_get(&pdev->dev, "core");
        if (IS_ERR(spdif_priv->coreclk)) {