ASoC: Intel: bytcr_rt5651: Change defaults to enable jack-detect, analog mics

Change the default quirk settings to enable jack-detect, analog mics.

The old default input mapping of DMIC for non Bay Trail CR devices seems
like a poor default as I'm not aware of any Intel SST + rt5651 using
devices with a DMIC.

All Cherry Trail devices using the bytcr_rt5651 machine driver seem to be
modelled after BYT-CR devices, And the only non CR Bay Trail devices with
a rt5651 codec I'm aware of are the Minnow boards for which we already have
board specific quirks. So it seems better to me to use the BYT-CR defaults
everywhere.

This e.g. makes the Chuwi Hi8 Pro (CWI513) work ootb without needing a
quirk.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c
index d5a3d48..6efd7c9 100644 (file)
--- a/sound/soc/intel/boards/bytcr_rt5651.c
+++ b/sound/soc/intel/boards/bytcr_rt5651.c
@@ -85,7 +85,12 @@ struct byt_rt5651_private {
        struct snd_soc_jack jack;
 };
 
-static unsigned long byt_rt5651_quirk = BYT_RT5651_MCLK_EN;
+/* Default: jack-detect on JD1_1, internal mic on in2, headsetmic on in3 */
+static unsigned long byt_rt5651_quirk = BYT_RT5651_MCLK_EN |
+                                       BYT_RT5651_JD1_1 |
+                                       BYT_RT5651_OVCD_TH_2000UA |
+                                       BYT_RT5651_OVCD_SF_0P75 |
+                                       BYT_RT5651_IN2_HS_IN3_MAP;
 
 static void log_quirks(struct device *dev)
 {
@@ -809,14 +814,6 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
                        /* no BIOS indications, assume SSP0-AIF2 connection */
                        byt_rt5651_quirk |= BYT_RT5651_SSP0_AIF2;
                }
-
-               /* change defaults for Baytrail-CR capture */
-               byt_rt5651_quirk |= BYT_RT5651_JD1_1 |
-                                   BYT_RT5651_OVCD_TH_2000UA |
-                                   BYT_RT5651_OVCD_SF_0P75 |
-                                   BYT_RT5651_IN2_HS_IN3_MAP;
-       } else {
-               byt_rt5651_quirk |= BYT_RT5651_DMIC_MAP;
        }
 
        /* check quirks before creating card */