|
@@ -65,14 +65,6 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,
|
|
|
return -EIO;
|
|
|
}
|
|
|
|
|
|
- /* Configure sysclk for codec */
|
|
|
- ret = snd_soc_dai_set_sysclk(codec_dai, DA7219_CLKSRC_MCLK, 24576000,
|
|
|
- SND_SOC_CLOCK_IN);
|
|
|
- if (ret) {
|
|
|
- dev_err(card->dev, "can't set codec sysclk configuration\n");
|
|
|
- return ret;
|
|
|
- }
|
|
|
-
|
|
|
if (SND_SOC_DAPM_EVENT_OFF(event)) {
|
|
|
ret = snd_soc_dai_set_pll(codec_dai, 0,
|
|
|
DA7219_SYSCLK_MCLK, 0, 0);
|
|
@@ -169,9 +161,18 @@ static int kabylake_da7219_codec_init(struct snd_soc_pcm_runtime *rtd)
|
|
|
{
|
|
|
struct kbl_codec_private *ctx = snd_soc_card_get_drvdata(rtd->card);
|
|
|
struct snd_soc_component *component = rtd->codec_dai->component;
|
|
|
+ struct snd_soc_dai *codec_dai = rtd->codec_dai;
|
|
|
struct snd_soc_jack *jack;
|
|
|
int ret;
|
|
|
|
|
|
+ /* Configure sysclk for codec */
|
|
|
+ ret = snd_soc_dai_set_sysclk(codec_dai, DA7219_CLKSRC_MCLK, 24576000,
|
|
|
+ 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.
|