ASoC: sdm845: Add configuration for headset codec
authorCheng-Yi Chiang <cychiang@chromium.org>
Wed, 28 Nov 2018 09:00:36 +0000 (17:00 +0800)
committerMark Brown <broonie@kernel.org>
Fri, 7 Dec 2018 12:20:44 +0000 (12:20 +0000)
Set DAI format and sysclk for headset codec.

Signed-off-by: Cheng-Yi Chiang <cychiang@chromium.org>
Acked-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/qcom/sdm845.c

index d0df7ec6042e2e3986d31cb94d06ca7d3f24ed90..1db8ef6682233feaf38145efb07af877c28a1ef2 100644 (file)
@@ -14,6 +14,7 @@
 #include <uapi/linux/input-event-codes.h>
 #include "common.h"
 #include "qdsp6/q6afe.h"
+#include "../codecs/rt5663.h"
 
 #define DEFAULT_SAMPLE_RATE_48K                48000
 #define DEFAULT_MCLK_RATE              24576000
@@ -125,9 +126,27 @@ static int sdm845_snd_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 ret = 0;
 
        switch (cpu_dai->id) {
+       case PRIMARY_MI2S_RX:
+       case PRIMARY_MI2S_TX:
+               /*
+                * Use ASRC for internal clocks, as PLL rate isn't multiple
+                * of BCLK.
+                */
+               rt5663_sel_asrc_clk_src(
+                       codec_dai->component,
+                       RT5663_DA_STEREO_FILTER | RT5663_AD_STEREO_FILTER,
+                       RT5663_CLK_SEL_I2S1_ASRC);
+               ret = snd_soc_dai_set_sysclk(
+                       codec_dai, RT5663_SCLK_S_MCLK, DEFAULT_MCLK_RATE,
+                       SND_SOC_CLOCK_IN);
+               if (ret < 0)
+                       dev_err(rtd->dev,
+                               "snd_soc_dai_set_sysclk err = %d\n", ret);
+               break;
        case QUATERNARY_TDM_RX_0:
        case QUATERNARY_TDM_TX_0:
                ret = sdm845_tdm_snd_hw_params(substream, params);
@@ -202,6 +221,7 @@ static int sdm845_snd_startup(struct snd_pcm_substream *substream)
        switch (cpu_dai->id) {
        case PRIMARY_MI2S_RX:
        case PRIMARY_MI2S_TX:
+               codec_dai_fmt |= SND_SOC_DAIFMT_NB_NF;
                if (++(data->pri_mi2s_clk_count) == 1) {
                        snd_soc_dai_set_sysclk(cpu_dai,
                                Q6AFE_LPASS_CLK_ID_MCLK_1,
@@ -211,6 +231,7 @@ static int sdm845_snd_startup(struct snd_pcm_substream *substream)
                                MI2S_BCLK_RATE, SNDRV_PCM_STREAM_PLAYBACK);
                }
                snd_soc_dai_set_fmt(cpu_dai, fmt);
+               snd_soc_dai_set_fmt(codec_dai, codec_dai_fmt);
                break;
 
        case SECONDARY_MI2S_TX: