Unverified Commit 96a388fe authored May 13, 2018 by Hans de Goede Committed by Mark Brown May 17, 2018

ASoC: Intel: bytcr_rt5640: Unify BYTCR input defaults



Currently we've 2 places with BYTCR defaults: 1. The generic catch-all
DMI_SYS_VENDOR=="Insyde" DMI quirk which selects SSP0-AIF1 for generic
Insyde BYTCR tablets without the ACPI channel package; and 2. the
defaults in the if (is_bytcr) {} code block.

Currently these are not identical, both select IN3 as the internal mic
output, but the "Insyde" DMI quirk leaves out the DIFF_MIC quirk. The
DIFF_MIC quirk should be enabled by default, because enabling diff. input
helps a lot for devices with a differential mic, where as it is a nop on
devices with a normal mic.

This commit adds the DIFF_MIC quirk to the "Insyde" DMI quirk path, by
adding a new BYTCR_INPUT_DEFAULTS define and using that in both code paths
which set BYTCR defaults.

Having a single place where the BYTCR input defaults are defined also
allows defining jack-detect defaults in a single place in a follow-up
commit.

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>

parent 737c1464

sound/soc/intel/boards/bytcr_rt5640.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -82,6 +82,10 @@ enum {
		#define BYT_RT5640_MCLK_EN BIT(22)
		#define BYT_RT5640_MCLK_25MHZ BIT(23)

		#define BYTCR_INPUT_DEFAULTS \
		(BYT_RT5640_IN3_MAP \| \
		BYT_RT5640_DIFF_MIC)

		/* in-diff or dmic-pin + jdsrc + ovcd-th + -sf + jd-inv + terminating entry */
		#define MAX_NO_PROPS 6

		@@ -475,7 +479,7 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "Insyde"),
		},
		.driver_data = (void *)(BYT_RT5640_IN3_MAP \|
		.driver_data = (void *)(BYTCR_INPUT_DEFAULTS \|
		BYT_RT5640_MCLK_EN \|
		BYT_RT5640_SSP0_AIF1),

		@@ -979,8 +983,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
		}

		/* change defaults for Baytrail-CR capture */
		byt_rt5640_quirk \|= BYT_RT5640_IN3_MAP;
		byt_rt5640_quirk \|= BYT_RT5640_DIFF_MIC;
		byt_rt5640_quirk \|= BYTCR_INPUT_DEFAULTS;
		} else {
		byt_rt5640_quirk \|= BYT_RT5640_DMIC1_MAP;
		}

Admin message