From c4c87cf337c6a8c35faf7f8fb9d89590b41d7943 Mon Sep 17 00:00:00 2001 From: Bard Liao Date: Wed, 6 Jan 2021 16:53:16 +0800 Subject: [PATCH 1/2] ALSA: hda: intel-dsp-config: simplify flags for TigerLake/ElkhartLake Currently, SOF is the only audio driver which supports TGL or EHL platforms. So we should select SOF driver unconditionally. Fixes: 82d9d54a6c0e ('ALSA: hda: add Intel DSP configuration / probe code') Signed-off-by: Bard Liao --- sound/hda/intel-dsp-config.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c index 6a0d070c60c9ac..f1d47378671ea3 100644 --- a/sound/hda/intel-dsp-config.c +++ b/sound/hda/intel-dsp-config.c @@ -293,26 +293,13 @@ 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, }, #endif /* Elkhart Lake */ #if IS_ENABLED(CONFIG_SND_SOC_SOF_ELKHARTLAKE) { - .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC, + .flags = FLAG_SOF, .device = 0x4b55, }, #endif From bc3f2dd2d0bad4856e7ad9bceec0cb09d009f995 Mon Sep 17 00:00:00 2001 From: Bard Liao Date: Mon, 4 Jan 2021 09:49:45 +0800 Subject: [PATCH 2/2] ALSA: hda: intel-dsp-config: add PCI id for TGL-H Adding PCI id for TGL-H and SOF will be the default audio driver. Signed-off-by: Bard Liao --- sound/hda/intel-dsp-config.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c index f1d47378671ea3..d744797ee72212 100644 --- a/sound/hda/intel-dsp-config.c +++ b/sound/hda/intel-dsp-config.c @@ -294,6 +294,10 @@ static const struct config_entry config_table[] = { .flags = FLAG_SOF, .device = 0xa0c8, }, + { + .flags = FLAG_SOF, + .device = 0x43c8, + }, #endif /* Elkhart Lake */