[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1446434042-2139-3-git-send-email-wxt@rock-chips.com>
Date: Mon, 2 Nov 2015 11:14:02 +0800
From: Caesar Wang <wxt@...k-chips.com>
To: Heiko Stuebner <heiko@...ech.de>, Mark Brown <broonie@...nel.org>
Cc: linux-rockchip@...ts.infradead.org,
Caesar Wang <wxt@...k-chips.com>,
Jaroslav Kysela <perex@...ex.cz>, alsa-devel@...a-project.org,
linux-kernel@...r.kernel.org, Takashi Iwai <tiwai@...e.com>,
Liam Girdwood <lgirdwood@...il.com>,
linux-arm-kernel@...ts.infradead.org
Subject: [PATCH 3/3] ASoC: rockchip-rt5645: add the divider the clock for cpu
Add to set the cpu/codec DAI configure, let's divider the
Transmit/Receive clock for cpu.
In master mode, The SCLK and LRCK are configured as output,
this patch should can set each divider to arrange the clock distribution.
Signed-off-by: Caesar Wang <wxt@...k-chips.com>
---
sound/soc/rockchip/rockchip_rt5645.c | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/sound/soc/rockchip/rockchip_rt5645.c b/sound/soc/rockchip/rockchip_rt5645.c
index 68c62e4..35fe000 100644
--- a/sound/soc/rockchip/rockchip_rt5645.c
+++ b/sound/soc/rockchip/rockchip_rt5645.c
@@ -74,8 +74,25 @@ static int rk_aif1_hw_params(struct snd_pcm_substream *substream,
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
struct snd_soc_dai *codec_dai = rtd->codec_dai;
+ int dai_fmt = rtd->card->dai_link->dai_fmt;
int mclk;
+ /* set codec DAI configuration */
+ ret = snd_soc_dai_set_fmt(codec_dai, dai_fmt);
+ if (ret < 0) {
+ dev_err(codec_dai->dev,
+ "failed to set the format for codec side\n");
+ return ret;
+ }
+
+ /* set cpu DAI configuration */
+ ret = snd_soc_dai_set_fmt(cpu_dai, dai_fmt);
+ if (ret < 0) {
+ dev_err(codec_dai->dev,
+ "failed to set the format for cpu side\n");
+ return ret;
+ }
+
switch (params_rate(params)) {
case 8000:
case 16000:
@@ -104,6 +121,21 @@ static int rk_aif1_hw_params(struct snd_pcm_substream *substream,
return ret;
}
+ /* The codec is master mode, that's not needed set clkdiv for cpu */
+ if ((dai_fmt & SND_SOC_DAIFMT_MASTER_MASK) == SND_SOC_DAIFMT_CBM_CFM)
+ return ret;
+
+ /* the LRCK clock for cpu */
+ ret = snd_soc_dai_set_clkdiv(cpu_dai, ROCKCHIP_DIV_BCLK,
+ (mclk / 4) / params_rate(params));
+ if (ret < 0)
+ return ret;
+
+ /* the SCLK clock for cpu */
+ snd_soc_dai_set_clkdiv(cpu_dai, ROCKCHIP_DIV_MCLK, 4);
+ if (ret < 0)
+ return ret;
+
return ret;
}
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists