diff options
| author | Mark Brown <broonie@kernel.org> | 2017-07-03 16:51:22 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-07-03 16:51:22 +0100 |
| commit | 9b0695f74c720e924bf10ce76b4c6973478cd759 (patch) | |
| tree | f82dafc6d2dc17e42656fd7188526d823ba664a9 /sound | |
| parent | 6f7da290413ba713f0cdd9ff1a2a9bb129ef4f6c (diff) | |
| parent | fd0f237572ada2b18fe1e8684ae9fa131b577a17 (diff) | |
| download | linux-riscv-9b0695f74c720e924bf10ce76b4c6973478cd759.tar.gz linux-riscv-9b0695f74c720e924bf10ce76b4c6973478cd759.tar.bz2 linux-riscv-9b0695f74c720e924bf10ce76b4c6973478cd759.zip | |
Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/intel/boards/bxt_da7219_max98357a.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sound/soc/intel/boards/bxt_da7219_max98357a.c b/sound/soc/intel/boards/bxt_da7219_max98357a.c index 3a8c4d954a91..1866e31b6c29 100644 --- a/sound/soc/intel/boards/bxt_da7219_max98357a.c +++ b/sound/soc/intel/boards/bxt_da7219_max98357a.c @@ -89,11 +89,6 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w, if (ret) dev_err(card->dev, "failed to stop PLL: %d\n", ret); } else if(SND_SOC_DAPM_EVENT_ON(event)) { - ret = snd_soc_dai_set_sysclk(codec_dai, - DA7219_CLKSRC_MCLK, 19200000, SND_SOC_CLOCK_IN); - if (ret) - dev_err(card->dev, "can't set codec sysclk configuration\n"); - ret = snd_soc_dai_set_pll(codec_dai, 0, DA7219_SYSCLK_PLL_SRM, 0, DA7219_PLL_FREQ_OUT_98304); if (ret) @@ -187,8 +182,17 @@ static int broxton_ssp_fixup(struct snd_soc_pcm_runtime *rtd, static int broxton_da7219_codec_init(struct snd_soc_pcm_runtime *rtd) { int ret; + struct snd_soc_dai *codec_dai = rtd->codec_dai; struct snd_soc_codec *codec = rtd->codec; + /* Configure sysclk for codec */ + ret = snd_soc_dai_set_sysclk(codec_dai, DA7219_CLKSRC_MCLK, 19200000, + SND_SOC_CLOCK_IN); + if (ret) { + dev_err(rtd->dev, "can't set codec sysclk configuration\n"); + return ret; + } + /* * Headset buttons map to the google Reference headset. * These can be configured by userspace. |