aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolin Chen <Guangyu.Chen@freescale.com>2014-04-28 11:07:51 -0400
committerMark Brown <broonie@linaro.org>2014-04-29 15:07:17 -0400
commit0b8643900a1bff32ad8bf17ef1f5d57b6d490502 (patch)
treee0392b5b712124693387c18185f312e0beb77593
parent08f7336e6404698158966d0c8a2937d3580e2693 (diff)
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>
-rw-r--r--sound/soc/fsl/fsl_spdif.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c
index ebddddcd55f8..7ae2a25ea642 100644
--- a/sound/soc/fsl/fsl_spdif.c
+++ b/sound/soc/fsl/fsl_spdif.c
@@ -81,6 +81,7 @@ struct fsl_spdif_priv {
81 struct clk *txclk[SPDIF_TXRATE_MAX]; 81 struct clk *txclk[SPDIF_TXRATE_MAX];
82 struct clk *rxclk; 82 struct clk *rxclk;
83 struct clk *coreclk; 83 struct clk *coreclk;
84 struct clk *sysclk;
84 struct snd_dmaengine_dai_dma_data dma_params_tx; 85 struct snd_dmaengine_dai_dma_data dma_params_tx;
85 struct snd_dmaengine_dai_dma_data dma_params_rx; 86 struct snd_dmaengine_dai_dma_data dma_params_rx;
86 87
@@ -767,7 +768,7 @@ static int spdif_get_rxclk_rate(struct fsl_spdif_priv *spdif_priv,
767 clksrc = (phaseconf >> SRPC_CLKSRC_SEL_OFFSET) & 0xf; 768 clksrc = (phaseconf >> SRPC_CLKSRC_SEL_OFFSET) & 0xf;
768 if (srpc_dpll_locked[clksrc] && (phaseconf & SRPC_DPLL_LOCKED)) { 769 if (srpc_dpll_locked[clksrc] && (phaseconf & SRPC_DPLL_LOCKED)) {
769 /* Get bus clock from system */ 770 /* Get bus clock from system */
770 busclk_freq = clk_get_rate(spdif_priv->rxclk); 771 busclk_freq = clk_get_rate(spdif_priv->sysclk);
771 } 772 }
772 773
773 /* FreqMeas_CLK = (BUS_CLK * FreqMeas) / 2 ^ 10 / GAINSEL / 128 */ 774 /* FreqMeas_CLK = (BUS_CLK * FreqMeas) / 2 ^ 10 / GAINSEL / 128 */
@@ -1147,6 +1148,13 @@ static int fsl_spdif_probe(struct platform_device *pdev)
1147 return ret; 1148 return ret;
1148 } 1149 }
1149 1150
1151 /* Get system clock for rx clock rate calculation */
1152 spdif_priv->sysclk = devm_clk_get(&pdev->dev, "rxtx5");
1153 if (IS_ERR(spdif_priv->sysclk)) {
1154 dev_err(&pdev->dev, "no sys clock (rxtx5) in devicetree\n");
1155 return PTR_ERR(spdif_priv->sysclk);
1156 }
1157
1150 /* Get core clock for data register access via DMA */ 1158 /* Get core clock for data register access via DMA */
1151 spdif_priv->coreclk = devm_clk_get(&pdev->dev, "core"); 1159 spdif_priv->coreclk = devm_clk_get(&pdev->dev, "core");
1152 if (IS_ERR(spdif_priv->coreclk)) { 1160 if (IS_ERR(spdif_priv->coreclk)) {