mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
ALSA: intel-dsp-config: add quirk for APL/GLK/TGL devices based on ES8336 codec
[ Upstream commit 9d36ceab94
]
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:
parent
fed89b5a4c
commit
2e46a58adf
1 changed files with 20 additions and 2 deletions
|
@ -31,6 +31,7 @@ struct config_entry {
|
||||||
u16 device;
|
u16 device;
|
||||||
u8 acpi_hid[ACPI_ID_LEN];
|
u8 acpi_hid[ACPI_ID_LEN];
|
||||||
const struct dmi_system_id *dmi_table;
|
const struct dmi_system_id *dmi_table;
|
||||||
|
u8 codec_hid[ACPI_ID_LEN];
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -56,7 +57,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)
|
||||||
{
|
{
|
||||||
|
@ -73,6 +74,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)
|
||||||
{
|
{
|
||||||
|
@ -137,7 +143,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)
|
||||||
|
@ -154,6 +160,11 @@ static const struct config_entry config_table[] = {
|
||||||
{}
|
{}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
.flags = FLAG_SOF,
|
||||||
|
.device = 0x3198,
|
||||||
|
.codec_hid = "ESSX8336",
|
||||||
|
},
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -311,6 +322,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 */
|
||||||
|
@ -354,6 +370,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;
|
||||||
|
|
Loading…
Reference in a new issue