ASoC: rt5677: Set ADC clock to use PLL and enable ASRC (ba0b3a97) · Commits · 戴 / test

sound/soc/codecs/rt5677.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -5046,6 +5046,11 @@ static const struct snd_soc_dai_ops rt5677_aif_dai_ops = {
		.set_tdm_slot = rt5677_set_tdm_slot,
		};

		static const struct snd_soc_dai_ops rt5677_dsp_dai_ops = {
		.set_sysclk = rt5677_set_dai_sysclk,
		.set_pll = rt5677_set_dai_pll,
		};

		static struct snd_soc_dai_driver rt5677_dai[] = {
		{
		.name = "rt5677-aif1",
		@@ -5152,6 +5157,7 @@ static struct snd_soc_dai_driver rt5677_dai[] = {
		.rates = SNDRV_PCM_RATE_16000,
		.formats = SNDRV_PCM_FMTBIT_S16_LE,
		},
		.ops = &rt5677_dsp_dai_ops,
		},
		};

sound/soc/codecs/rt5677.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -1336,6 +1336,8 @@
		#define RT5677_PLL_M_SFT 12
		#define RT5677_PLL_M_BP (0x1 << 11)
		#define RT5677_PLL_M_BP_SFT 11
		#define RT5677_PLL_UPDATE_PLL1 (0x1 << 1)
		#define RT5677_PLL_UPDATE_PLL1_SFT 1

		/* Global Clock Control 1 (0x80) */
		#define RT5677_SCLK_SRC_MASK (0x3 << 14)

sound/soc/intel/boards/bdw-rt5677.c

+33 −0

Original line number	Diff line number	Diff line
		@@ -170,10 +170,37 @@ static int bdw_rt5677_hw_params(struct snd_pcm_substream *substream,
		return ret;
		}

		static int bdw_rt5677_dsp_hw_params(struct snd_pcm_substream *substream,
		struct snd_pcm_hw_params *params)
		{
		struct snd_soc_pcm_runtime *rtd = substream->private_data;
		struct snd_soc_dai *codec_dai = rtd->codec_dai;
		int ret;

		ret = snd_soc_dai_set_sysclk(codec_dai, RT5677_SCLK_S_PLL1, 24576000,
		SND_SOC_CLOCK_IN);
		if (ret < 0) {
		dev_err(rtd->dev, "can't set codec sysclk configuration\n");
		return ret;
		}
		ret = snd_soc_dai_set_pll(codec_dai, 0, RT5677_PLL1_S_MCLK,
		24000000, 24576000);
		if (ret < 0) {
		dev_err(rtd->dev, "can't set codec pll configuration\n");
		return ret;
		}

		return 0;
		}

		static const struct snd_soc_ops bdw_rt5677_ops = {
		.hw_params = bdw_rt5677_hw_params,
		};

		static const struct snd_soc_ops bdw_rt5677_dsp_ops = {
		.hw_params = bdw_rt5677_dsp_hw_params,
		};

		#if !IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL)
		static int bdw_rt5677_rtd_init(struct snd_soc_pcm_runtime *rtd)
		{
		@@ -213,6 +240,11 @@ static int bdw_rt5677_init(struct snd_soc_pcm_runtime *rtd)
		rt5677_sel_asrc_clk_src(component, RT5677_DA_STEREO_FILTER \|
		RT5677_AD_STEREO1_FILTER \| RT5677_I2S1_SOURCE,
		RT5677_CLK_SEL_I2S1_ASRC);
		/* Enable codec ASRC function for Mono ADC L.
		* The ASRC clock source is clk_sys2_asrc.
		*/
		rt5677_sel_asrc_clk_src(component, RT5677_AD_MONO_L_FILTER,
		RT5677_CLK_SEL_SYS2);

		/* Request rt5677 GPIO for headphone amp control */
		bdw_rt5677->gpio_hp_en = devm_gpiod_get(component->dev, "headphone-enable",
		@@ -291,6 +323,7 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = {
		{
		.name = "Codec DSP",
		.stream_name = "Wake on Voice",
		.ops = &bdw_rt5677_dsp_ops,
		SND_SOC_DAILINK_REG(dsp),
		},

Admin message