Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 64484cce authored by Hans de Goede's avatar Hans de Goede Committed by Mark Brown
Browse files

ASoC: Intel: bytcr_rt5651: Set card long_name based on quirks 



Many X86 devices using a BYT SoC + RT5651 codec are cheap devices with
generic DMI strings, causing snd_soc_set_dmi_name() to fail to set a
long_name, making it impossible for userspace to have a correct UCM
profile which knowns which input is connected to the internal mic,
which input is connected to the hsmic (for correct jack-based switching)
and which inputs are unused.

Our quirks already specify which inputs the internal and headset mic
are connected to.

This commit sets a long_name based on the quirks so that userspace can
have UCM profiles doing the right thing based on the long_name.

Note that if we ever encounter the need for a special UCM profile for
some device we can add a quirk to set a specific long_name for the
device,

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 983333c0

sound/soc/intel/boards/bytcr_rt5651.c

+11 −0
Original line number Diff line number Diff line
@@ -706,6 +706,7 @@ static struct snd_soc_card byt_rt5651_card = { 
static char byt_rt5651_codec_name[SND_ACPI_I2C_ID_LEN];

static char byt_rt5651_codec_aif_name[12]; /*  = "rt5651-aif[1|2]" */

static char byt_rt5651_cpu_dai_name[10]; /*  = "ssp[0|2]-port" */

static char byt_rt5651_long_name[40]; /* = "bytcr-rt5651-*-spk-*-mic" */



static bool is_valleyview(void)

{
@@ -726,6 +727,10 @@ struct acpi_chan_package { /* ACPICA seems to require 64 bit integers */ 


static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)

{

	const char * const intmic_name[] =

		{ "dmic", "in1", "in2", "in12", "in1", "in2" };

	const char * const hsmic_name[] =

		{  "in2", "in2", "in1",  "in3", "in3", "in3" };

	struct byt_rt5651_private *priv;

	struct snd_soc_acpi_mach *mach;

	const char *i2c_name = NULL;
@@ -870,6 +875,12 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) 
		}

	}



	snprintf(byt_rt5651_long_name, sizeof(byt_rt5651_long_name),

		 "bytcr-rt5651-%s-intmic-%s-hsmic",

		 intmic_name[BYT_RT5651_MAP(byt_rt5651_quirk)],

		 hsmic_name[BYT_RT5651_MAP(byt_rt5651_quirk)]);

	byt_rt5651_card.long_name = byt_rt5651_long_name;



	ret_val = devm_snd_soc_register_card(&pdev->dev, &byt_rt5651_card);



	if (ret_val) {