diff options
| author | Nicolin Chen <Guangyu.Chen@freescale.com> | 2014-04-18 18:01:05 +0800 |
|---|---|---|
| committer | Nicolin Chen <Guangyu.Chen@freescale.com> | 2014-04-22 12:02:44 +0800 |
| commit | b9207d422d82d039de2803c3541381eaf1838929 (patch) | |
| tree | 3b99c3293131c33ac789422565e0cc0417b2486e | |
| parent | 627fd5ad13d247065707010e1e1bbf4949b04d23 (diff) | |
ENGR00309468-1 ASoC: fsl_spdif: Add coreclk control for DMA access
Even if we assign regmap to manage the coreclk control, we still need
to open the clock if we are going to run the driver because DMA access
would not be detected by regmap.
So this patch adds clock control for coreclk.
Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com>
(cherry picked from commit 7e9a6bb3eb4df21f96a6f3efd1f3a334a910b2ac)
| -rw-r--r-- | sound/soc/fsl/fsl_spdif.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c index 99480fe77f4f..4f42bb7ea6a4 100644 --- a/sound/soc/fsl/fsl_spdif.c +++ b/sound/soc/fsl/fsl_spdif.c @@ -1,7 +1,7 @@ /* * Freescale S/PDIF ALSA SoC Digital Audio Interface (DAI) driver * - * Copyright (C) 2013 Freescale Semiconductor, Inc. + * Copyright (C) 2013-2014 Freescale Semiconductor, Inc. * * Based on stmp3xxx_spdif_dai.c * Vladimir Barinov <vbarinov@embeddedalley.com> @@ -82,6 +82,7 @@ struct fsl_spdif_priv { u8 rxclk_src; struct clk *txclk[SPDIF_TXRATE_MAX]; struct clk *rxclk; + struct clk *coreclk; struct clk *sysclk; struct clk *dmaclk; struct snd_dmaengine_dai_dma_data dma_params_tx; @@ -426,6 +427,7 @@ static int fsl_spdif_startup(struct snd_pcm_substream *substream, int ret; pm_runtime_get_sync(cpu_dai->dev); + clk_prepare_enable(spdif_priv->coreclk); clk_prepare_enable(spdif_priv->dmaclk); /* Reset module and interrupts only for first initialization */ @@ -494,6 +496,7 @@ static void fsl_spdif_shutdown(struct snd_pcm_substream *substream, } clk_disable_unprepare(spdif_priv->dmaclk); + clk_disable_unprepare(spdif_priv->coreclk); pm_runtime_put_sync(cpu_dai->dev); } @@ -1162,6 +1165,13 @@ static int fsl_spdif_probe(struct platform_device *pdev) 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)) { + dev_err(&pdev->dev, "no core clock in devicetree\n"); + return PTR_ERR(spdif_priv->coreclk); + } + /* Get dma clock for dma script operation */ spdif_priv->dmaclk = devm_clk_get(&pdev->dev, "dma"); if (IS_ERR(spdif_priv->dmaclk)) { |