Unverified Commit 9d36ceab authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

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



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: default avatarHuajun Li <huajun.li@intel.com>
Signed-off-by: default avatarHuajun Li <huajun.li@intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20211004213512.220836-3-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 790049fb

sound/hda/intel-dsp-config.c

+20 −2
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ struct config_entry { 
	u16 device;

	u8 acpi_hid[ACPI_ID_LEN];

	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)

 * 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)

	{
@@ -73,6 +74,11 @@ static const struct config_entry config_table[] = { 
			{}

		}

	},

	{

		.flags = FLAG_SOF,

		.device = 0x5a98,

		.codec_hid = "ESSX8336",

	},

#endif

#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

 * Chromebooks

 * Chromebooks and devices based on the ES8336 codec

 */

/* 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



/*
@@ -311,6 +322,11 @@ static const struct config_entry config_table[] = { 
		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,

		.device = 0x43c8,

	},

	{

		.flags = FLAG_SOF,

		.device = 0xa0c8,

		.codec_hid = "ESSX8336",

	},

#endif



/* Elkhart Lake */
@@ -354,6 +370,8 @@ static const struct config_entry *snd_intel_dsp_find_config 
			continue;

		if (table->dmi_table && !dmi_check_system(table->dmi_table))

			continue;

		if (table->codec_hid[0] && !acpi_dev_present(table->codec_hid, NULL, -1))

			continue;

		return table;

	}

	return NULL;