From a0bc3e1e4723f65a4b61a579a009464c1957f1e7 Mon Sep 17 00:00:00 2001 From: Bard Liao Date: Thu, 7 Jan 2021 20:06:25 +0800 Subject: [PATCH 1/2] Revert "ALSA: hda: intel-dsp-config: simplify flags for TigerLake/ElkhartLake" Legacy HDA driver should be the default unless Soundwire or DMIC is detected. Signed-off-by: Bard Liao --- sound/hda/intel-dsp-config.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c index d744797ee72212..24ba1b7846c6fe 100644 --- a/sound/hda/intel-dsp-config.c +++ b/sound/hda/intel-dsp-config.c @@ -293,6 +293,19 @@ static const struct config_entry config_table[] = { { .flags = FLAG_SOF, .device = 0xa0c8, + .dmi_table = (const struct dmi_system_id []) { + { + .ident = "Google Chromebooks", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Google"), + } + }, + {} + } + }, + { + .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, + .device = 0xa0c8, }, { .flags = FLAG_SOF, @@ -303,7 +316,7 @@ static const struct config_entry config_table[] = { /* Elkhart Lake */ #if IS_ENABLED(CONFIG_SND_SOC_SOF_ELKHARTLAKE) { - .flags = FLAG_SOF, + .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC, .device = 0x4b55, }, #endif From c0ca2bc6aefd5efb20379fad66d366827460d231 Mon Sep 17 00:00:00 2001 From: Bard Liao Date: Thu, 7 Jan 2021 20:09:39 +0800 Subject: [PATCH 2/2] fixup! ALSA: hda: intel-dsp-config: add PCI id for TGL-H Legacy HDA driver should still be the default unless Soundwire or DMIC is detected. Signed-off-by: Bard Liao --- sound/hda/intel-dsp-config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c index 24ba1b7846c6fe..c4568617251723 100644 --- a/sound/hda/intel-dsp-config.c +++ b/sound/hda/intel-dsp-config.c @@ -308,7 +308,7 @@ static const struct config_entry config_table[] = { .device = 0xa0c8, }, { - .flags = FLAG_SOF, + .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, .device = 0x43c8, }, #endif