Skip to content

Commit ec6f82b

Browse files
jwrdegoedebroonie
authored andcommitted
ASoC: Intel: soc-acpi-cht: Add quirk for Nextbook Ares 8A tablet
The Nextbook Ares 8A tablet which has Android as factory OS, has a buggy DSDT with both ESSX8316 and 10EC5651 ACPI devices. This tablet actually uses an rt5651 codec, but the matching code ends up picking the ESSX8316 device, add a quirk to ignote the ESSX8316 device on this tablet. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Message-Id: <20230429104721.7176-1-hdegoede@redhat.com> Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 4a1b5bc commit ec6f82b

1 file changed

Lines changed: 26 additions & 0 deletions

File tree

sound/soc/intel/common/soc-acpi-intel-cht-match.c

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,31 @@ static struct snd_soc_acpi_mach *cht_quirk(void *arg)
5050
return mach;
5151
}
5252

53+
/*
54+
* Some tablets with Android factory OS have buggy DSDTs with an ESSX8316 device
55+
* in the ACPI tables. While they are not using an ESS8316 codec. These DSDTs
56+
* also have an ACPI device for the correct codec, ignore the ESSX8316.
57+
*/
58+
static const struct dmi_system_id cht_ess8316_not_present_table[] = {
59+
{
60+
/* Nextbook Ares 8A */
61+
.matches = {
62+
DMI_MATCH(DMI_SYS_VENDOR, "Insyde"),
63+
DMI_MATCH(DMI_PRODUCT_NAME, "CherryTrail"),
64+
DMI_MATCH(DMI_BIOS_VERSION, "M882"),
65+
},
66+
},
67+
{ }
68+
};
69+
70+
static struct snd_soc_acpi_mach *cht_ess8316_quirk(void *arg)
71+
{
72+
if (dmi_check_system(cht_ess8316_not_present_table))
73+
return NULL;
74+
75+
return arg;
76+
}
77+
5378
static const struct snd_soc_acpi_codecs rt5640_comp_ids = {
5479
.num_codecs = 2,
5580
.codecs = { "10EC5640", "10EC3276" },
@@ -113,6 +138,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[] = {
113138
.drv_name = "bytcht_es8316",
114139
.fw_filename = "intel/fw_sst_22a8.bin",
115140
.board = "bytcht_es8316",
141+
.machine_quirk = cht_ess8316_quirk,
116142
.sof_tplg_filename = "sof-cht-es8316.tplg",
117143
},
118144
/* some CHT-T platforms rely on RT5640, use Baytrail machine driver */

0 commit comments

Comments
 (0)