summaryrefslogtreecommitdiffstats
path: root/sound/soc/intel
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2018-06-24 16:06:27 +0200
committerMark Brown <broonie@kernel.org>2018-06-27 12:10:58 +0100
commit10876d24eb40c6bfaa0aabd97e3e143258176c53 (patch)
tree3f864d33d957e94dc0818540275e54aa252c9b10 /sound/soc/intel
parentfc7c460fbb4003bf3f5d2b435079c85888644663 (diff)
downloadlinux-10876d24eb40c6bfaa0aabd97e3e143258176c53.tar.bz2
ASoC: Intel: bytcr_rt5651: Change default input map from in2 to in1
Further testing on all 6 model x86 tablets with a rt5651 which I have access to for testing has shown that their single (mono) microphone is connected to both IN1 *and* IN2. The previous default mapping of IN2 was based on testing on the same 6 tablets, where the internal mic works fine with a mapping of IN2. But it works fine too with a mapping of IN1. This commit changes the default input mapping to to use IN1 instead of IN2, to match the mapping used for the other mono devices in the DMI quirk table. So that we need less different mappings. The same change is made to the Chuwi Vi8 Plus quirks, which is one of the 6 models tested. This is a preparation patch for simplifying the maps in a follow-up commit. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel')
-rw-r--r--sound/soc/intel/boards/bytcr_rt5651.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c
index 735b8312e275..910890de38b0 100644
--- a/sound/soc/intel/boards/bytcr_rt5651.c
+++ b/sound/soc/intel/boards/bytcr_rt5651.c
@@ -90,9 +90,9 @@ struct byt_rt5651_private {
struct snd_soc_jack jack;
};
-/* Default: jack-detect on JD1_1, internal mic on in2, headsetmic on in3 */
+/* Default: jack-detect on JD1_1, internal mic on in1, headsetmic on in3 */
static unsigned long byt_rt5651_quirk = BYT_RT5651_DEFAULT_QUIRKS |
- BYT_RT5651_IN2_HS_IN3_MAP;
+ BYT_RT5651_IN1_HS_IN3_MAP;
static void log_quirks(struct device *dev)
{
@@ -392,7 +392,7 @@ static const struct dmi_system_id byt_rt5651_quirk_table[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "D2D3_Vi8A1"),
},
.driver_data = (void *)(BYT_RT5651_DEFAULT_QUIRKS |
- BYT_RT5651_IN2_HS_IN3_MAP),
+ BYT_RT5651_IN1_HS_IN3_MAP),
},
{
/* VIOS LTH17 */