ASoC: Intel: bytcht_es8316: Add quirk for the Teclast X98+ II

The Teclast X98+ II is a Cherrytrail tablet, which require two quirks:
- it has stereo speakers,
- its jack detection mechanism is inverted.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c
index ccf552e..3897582 100644 (file)
--- a/sound/soc/intel/boards/bytcht_es8316.c
+++ b/sound/soc/intel/boards/bytcht_es8316.c
@@ -22,6 +22,7 @@
 #include <linux/acpi.h>
 #include <linux/clk.h>
 #include <linux/device.h>
+#include <linux/dmi.h>
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/init.h>
@@ -441,11 +442,25 @@ static const struct acpi_gpio_mapping byt_cht_es8316_gpios[] = {
        { },
 };
 
+/* Please keep this list alphabetically sorted */
+static const struct dmi_system_id byt_cht_es8316_quirk_table[] = {
+       {       /* Teclast X98 Plus II */
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "TECLAST"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "X98 Plus II"),
+               },
+               .driver_data = (void *)(BYT_CHT_ES8316_INTMIC_IN1_MAP
+                                       | BYT_CHT_ES8316_JD_INVERTED),
+       },
+       {}
+};
+
 static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev)
 {
        static const char * const mic_name[] = { "in1", "in2" };
        struct property_entry props[MAX_NO_PROPS] = {};
        struct byt_cht_es8316_private *priv;
+       const struct dmi_system_id *dmi_id;
        struct device *dev = &pdev->dev;
        struct snd_soc_acpi_mach *mach;
        const char *platform_name;
@@ -488,7 +503,10 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev)
                return ret;
 
        /* Check for BYTCR or other platform and setup quirks */
-       if (x86_match_cpu(baytrail_cpu_ids) &&
+       dmi_id = dmi_first_match(byt_cht_es8316_quirk_table);
+       if (dmi_id) {
+               quirk = (int)dmi_id->driver_data;
+       } else if (x86_match_cpu(baytrail_cpu_ids) &&
            mach->mach_params.acpi_ipc_irq_index == 0) {
                /* On BYTCR default to SSP0, internal-mic-in2-map, mono-spk */
                quirk = BYT_CHT_ES8316_SSP0 | BYT_CHT_ES8316_INTMIC_IN2_MAP |