Commit 2390c9b4 authored by Jenny TC's avatar Jenny TC Committed by Mark Brown

ASoC: Intel: kbl_da7219_max98927: remove headset

kbl_da7219_max98927 supports two configurations - One with da7219 &
max98927/373 and other one with max98927/373 alone. This patch
removes the headset dais from max98927/373 configuration. Since the
snd_soc_dapm_ignore_suspend for DMIC is called from da7219_codec_init,
the code is re-arranged to invoke snd_soc_dapm_ignore_suspend from
kabylake_dmic_init.
Signed-off-by: default avatarJenny TC <jenny.tc@intel.com>
Acked-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a8d218f4
...@@ -52,7 +52,6 @@ struct kbl_codec_private { ...@@ -52,7 +52,6 @@ struct kbl_codec_private {
enum { enum {
KBL_DPCM_AUDIO_PB = 0, KBL_DPCM_AUDIO_PB = 0,
KBL_DPCM_AUDIO_CP,
KBL_DPCM_AUDIO_ECHO_REF_CP, KBL_DPCM_AUDIO_ECHO_REF_CP,
KBL_DPCM_AUDIO_REF_CP, KBL_DPCM_AUDIO_REF_CP,
KBL_DPCM_AUDIO_DMIC_CP, KBL_DPCM_AUDIO_DMIC_CP,
...@@ -60,6 +59,7 @@ enum { ...@@ -60,6 +59,7 @@ enum {
KBL_DPCM_AUDIO_HDMI2_PB, KBL_DPCM_AUDIO_HDMI2_PB,
KBL_DPCM_AUDIO_HDMI3_PB, KBL_DPCM_AUDIO_HDMI3_PB,
KBL_DPCM_AUDIO_HS_PB, KBL_DPCM_AUDIO_HS_PB,
KBL_DPCM_AUDIO_CP,
}; };
static int platform_clock_control(struct snd_soc_dapm_widget *w, static int platform_clock_control(struct snd_soc_dapm_widget *w,
...@@ -311,6 +311,12 @@ static int kabylake_da7219_codec_init(struct snd_soc_pcm_runtime *rtd) ...@@ -311,6 +311,12 @@ static int kabylake_da7219_codec_init(struct snd_soc_pcm_runtime *rtd)
da7219_aad_jack_det(component, &ctx->kabylake_headset); da7219_aad_jack_det(component, &ctx->kabylake_headset);
return 0;
}
static int kabylake_dmic_init(struct snd_soc_pcm_runtime *rtd)
{
int ret;
ret = snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "SoC DMIC"); ret = snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "SoC DMIC");
if (ret) if (ret)
dev_err(rtd->dev, "SoC DMIC - Ignore suspend failed %d\n", ret); dev_err(rtd->dev, "SoC DMIC - Ignore suspend failed %d\n", ret);
...@@ -581,20 +587,6 @@ static struct snd_soc_dai_link kabylake_dais[] = { ...@@ -581,20 +587,6 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.dpcm_playback = 1, .dpcm_playback = 1,
.ops = &kabylake_da7219_fe_ops, .ops = &kabylake_da7219_fe_ops,
}, },
[KBL_DPCM_AUDIO_CP] = {
.name = "Kbl Audio Capture Port",
.stream_name = "Audio Record",
.cpu_dai_name = "System Pin",
.platform_name = "0000:00:1f.3",
.dynamic = 1,
.codec_name = "snd-soc-dummy",
.codec_dai_name = "snd-soc-dummy-dai",
.nonatomic = 1,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
.dpcm_capture = 1,
.ops = &kabylake_da7219_fe_ops,
},
[KBL_DPCM_AUDIO_ECHO_REF_CP] = { [KBL_DPCM_AUDIO_ECHO_REF_CP] = {
.name = "Kbl Audio Echo Reference cap", .name = "Kbl Audio Echo Reference cap",
.stream_name = "Echoreference Capture", .stream_name = "Echoreference Capture",
...@@ -690,6 +682,20 @@ static struct snd_soc_dai_link kabylake_dais[] = { ...@@ -690,6 +682,20 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.ops = &kabylake_da7219_fe_ops, .ops = &kabylake_da7219_fe_ops,
}, },
[KBL_DPCM_AUDIO_CP] = {
.name = "Kbl Audio Capture Port",
.stream_name = "Audio Record",
.cpu_dai_name = "System Pin",
.platform_name = "0000:00:1f.3",
.dynamic = 1,
.codec_name = "snd-soc-dummy",
.codec_dai_name = "snd-soc-dummy-dai",
.nonatomic = 1,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
.dpcm_capture = 1,
.ops = &kabylake_da7219_fe_ops,
},
/* Back End DAI links */ /* Back End DAI links */
{ {
...@@ -733,6 +739,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { ...@@ -733,6 +739,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.cpu_dai_name = "DMIC01 Pin", .cpu_dai_name = "DMIC01 Pin",
.codec_name = "dmic-codec", .codec_name = "dmic-codec",
.codec_dai_name = "dmic-hifi", .codec_dai_name = "dmic-hifi",
.init = kabylake_dmic_init,
.platform_name = "0000:00:1f.3", .platform_name = "0000:00:1f.3",
.be_hw_params_fixup = kabylake_dmic_fixup, .be_hw_params_fixup = kabylake_dmic_fixup,
.ignore_suspend = 1, .ignore_suspend = 1,
...@@ -792,20 +799,6 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = { ...@@ -792,20 +799,6 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = {
.dpcm_playback = 1, .dpcm_playback = 1,
.ops = &kabylake_da7219_fe_ops, .ops = &kabylake_da7219_fe_ops,
}, },
[KBL_DPCM_AUDIO_CP] = {
.name = "Kbl Audio Capture Port",
.stream_name = "Audio Record",
.cpu_dai_name = "System Pin",
.platform_name = "0000:00:1f.3",
.dynamic = 1,
.codec_name = "snd-soc-dummy",
.codec_dai_name = "snd-soc-dummy-dai",
.nonatomic = 1,
.trigger = {
SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
.dpcm_capture = 1,
.ops = &kabylake_da7219_fe_ops,
},
[KBL_DPCM_AUDIO_ECHO_REF_CP] = { [KBL_DPCM_AUDIO_ECHO_REF_CP] = {
.name = "Kbl Audio Echo Reference cap", .name = "Kbl Audio Echo Reference cap",
.stream_name = "Echoreference Capture", .stream_name = "Echoreference Capture",
...@@ -911,6 +904,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = { ...@@ -911,6 +904,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = {
.cpu_dai_name = "DMIC01 Pin", .cpu_dai_name = "DMIC01 Pin",
.codec_name = "dmic-codec", .codec_name = "dmic-codec",
.codec_dai_name = "dmic-hifi", .codec_dai_name = "dmic-hifi",
.init = kabylake_dmic_init,
.platform_name = "0000:00:1f.3", .platform_name = "0000:00:1f.3",
.be_hw_params_fixup = kabylake_dmic_fixup, .be_hw_params_fixup = kabylake_dmic_fixup,
.ignore_suspend = 1, .ignore_suspend = 1,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment