AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ALSA: intel-dsp-config: add quirk for APL/GLK/TGL devices based on ES8336 codec

Browse Source 
[ Upstream commit 9d36ceab94151f07cf3fcb067213ac87937adf12 ]

These devices are based on an I2C/I2S device, we need to force the use
of the SOF driver otherwise the legacy HDaudio driver will be loaded -
only HDMI will be supported.

Co-developed-by: Huajun Li <huajun.li@intel.com>
Signed-off-by: Huajun Li <huajun.li@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20211004213512.220836-3-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Pierre-Louis Bossart 2021-10-04 16:35:09 -05:00 committed by Greg Kroah-Hartman
parent 055eced3ed
commit 02a22911ed
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sound/hda/intel-dsp-config.c
View File

@ -30,6 +30,7 @@ struct config_entry {
u32 flags; u32 flags;
u16 device; u16 device;
const struct dmi_system_id *dmi_table; const struct dmi_system_id *dmi_table;
u8 codec_hid[ACPI_ID_LEN];
}; };
/* /*
@ -55,7 +56,7 @@ static const struct config_entry config_table[] = {
/* /*
* Apollolake (Broxton-P) * Apollolake (Broxton-P)
* the legacy HDAudio driver is used except on Up Squared (SOF) and * the legacy HDAudio driver is used except on Up Squared (SOF) and
* Chromebooks (SST) * Chromebooks (SST), as well as devices based on the ES8336 codec
*/ */
#if IS_ENABLED(CONFIG_SND_SOC_SOF_APOLLOLAKE) #if IS_ENABLED(CONFIG_SND_SOC_SOF_APOLLOLAKE)
{ {
@ -72,6 +73,11 @@ static const struct config_entry config_table[] = {
{} {}
} }
}, },
{
.flags = FLAG_SOF,
.device = 0x5a98,
.codec_hid = "ESSX8336",
},
#endif #endif
#if IS_ENABLED(CONFIG_SND_SOC_INTEL_APL) #if IS_ENABLED(CONFIG_SND_SOC_INTEL_APL)
{ {
@ -136,7 +142,7 @@ static const struct config_entry config_table[] = {
/* /*
* Geminilake uses legacy HDAudio driver except for Google * Geminilake uses legacy HDAudio driver except for Google
* Chromebooks * Chromebooks and devices based on the ES8336 codec
*/ */
/* Geminilake */ /* Geminilake */
#if IS_ENABLED(CONFIG_SND_SOC_SOF_GEMINILAKE) #if IS_ENABLED(CONFIG_SND_SOC_SOF_GEMINILAKE)
@ -153,6 +159,11 @@ static const struct config_entry config_table[] = {
{} {}
} }
}, },
{
.flags = FLAG_SOF,
.device = 0x3198,
.codec_hid = "ESSX8336",
},
#endif #endif
/* /*
@ -310,6 +321,11 @@ static const struct config_entry config_table[] = {
.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
.device = 0x43c8, .device = 0x43c8,
}, },
{
.flags = FLAG_SOF,
.device = 0xa0c8,
.codec_hid = "ESSX8336",
},
#endif #endif
/* Elkhart Lake */ /* Elkhart Lake */
@ -337,6 +353,8 @@ static const struct config_entry *snd_intel_dsp_find_config
continue; continue;
if (table->dmi_table && !dmi_check_system(table->dmi_table)) if (table->dmi_table && !dmi_check_system(table->dmi_table))
continue; continue;
if (table->codec_hid[0] && !acpi_dev_present(table->codec_hid, NULL, -1))
continue;
return table; return table;
} }
return NULL; return NULL;