ASoC: Intel: bytcr_rt5640: Add default jack-detect settings

Out of the 11 BYTCR devices which I have access to for testing, 6 use
JD1IN4P for jack-detect, 2 use JD1IN4P non-inverted and the other 3 use
JD2IN4N, the ones not using JD1IN4P are all also special in other ways and
need a DMI quirk regardless.

All 5 BYT (non CR) devices which I have access to use JD2IN4N.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
index 355c241470b5d5e20e839aeb7548fcc8e8ec9cda..b00f21ed43577de524fc3b09fbbd547e529e86d5 100644 (file)
--- a/sound/soc/intel/boards/bytcr_rt5640.c
+++ b/sound/soc/intel/boards/bytcr_rt5640.c
@@ -84,6 +84,9 @@ enum {
 
 #define BYTCR_INPUT_DEFAULTS                           \
        (BYT_RT5640_IN3_MAP |                           \
+        BYT_RT5640_JD_SRC_JD1_IN4P |                   \
+        BYT_RT5640_OVCD_TH_2000UA |                    \
+        BYT_RT5640_OVCD_SF_0P75 |                      \
         BYT_RT5640_DIFF_MIC)
 
 /* in-diff or dmic-pin + jdsrc + ovcd-th + -sf + jd-inv + terminating entry */
@@ -985,7 +988,10 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
                /* change defaults for Baytrail-CR capture */
                byt_rt5640_quirk |= BYTCR_INPUT_DEFAULTS;
        } else {
-               byt_rt5640_quirk |= BYT_RT5640_DMIC1_MAP;
+               byt_rt5640_quirk |= BYT_RT5640_DMIC1_MAP |
+                                   BYT_RT5640_JD_SRC_JD2_IN4N |
+                                   BYT_RT5640_OVCD_TH_2000UA |
+                                   BYT_RT5640_OVCD_SF_0P75;
        }
 
        /* check quirks before creating card */