ASoC: Intel: move sysclk source setting to platform_clock_control for balance. (8d0c38a3) · Commits · 戴 / test

sound/soc/intel/cht_bsw_rt5672.c

+28 −12

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,
		struct snd_soc_dapm_context *dapm = w->dapm;
		struct snd_soc_card *card = dapm->card;
		struct snd_soc_dai *codec_dai;
		int ret;

		codec_dai = cht_get_codec_dai(card);
		if (!codec_dai) {
		@@ -57,17 +58,31 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,
		return -EIO;
		}

		if (!SND_SOC_DAPM_EVENT_OFF(event))
		return 0;
		if (SND_SOC_DAPM_EVENT_ON(event)) {
		/* set codec PLL source to the 19.2MHz platform clock (MCLK) */
		ret = snd_soc_dai_set_pll(codec_dai, 0, RT5670_PLL1_S_MCLK,
		CHT_PLAT_CLK_3_HZ, 48000 * 512);
		if (ret < 0) {
		dev_err(card->dev, "can't set codec pll: %d\n", ret);
		return ret;
		}

		/* Set codec sysclk source to its internal clock because codec PLL will
		* be off when idle and MCLK will also be off by ACPI when codec is
		* runtime suspended. Codec needs clock for jack detection and button
		* press.
		/* set codec sysclk source to PLL */
		ret = snd_soc_dai_set_sysclk(codec_dai, RT5670_SCLK_S_PLL1,
		48000 * 512, SND_SOC_CLOCK_IN);
		if (ret < 0) {
		dev_err(card->dev, "can't set codec sysclk: %d\n", ret);
		return ret;
		}
		} else {
		/* Set codec sysclk source to its internal clock because codec
		* PLL will be off when idle and MCLK will also be off by ACPI
		* when codec is runtime suspended. Codec needs clock for jack
		* detection and button press.
		*/
		snd_soc_dai_set_sysclk(codec_dai, RT5670_SCLK_S_RCCLK,
		0, SND_SOC_CLOCK_IN);

		48000 * 512, SND_SOC_CLOCK_IN);
		}
		return 0;
		}

		@@ -77,7 +92,8 @@ static const struct snd_soc_dapm_widget cht_dapm_widgets[] = {
		SND_SOC_DAPM_MIC("Int Mic", NULL),
		SND_SOC_DAPM_SPK("Ext Spk", NULL),
		SND_SOC_DAPM_SUPPLY("Platform Clock", SND_SOC_NOPM, 0, 0,
		platform_clock_control, SND_SOC_DAPM_POST_PMD),
		platform_clock_control, SND_SOC_DAPM_PRE_PMU \|
		SND_SOC_DAPM_POST_PMD),
		};

		static const struct snd_soc_dapm_route cht_audio_map[] = {

Admin message