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

Unverified Commit 8e69cd64 authored by Hans de Goede's avatar Hans de Goede Committed by Mark Brown
Browse files

ASoC: Intel: bytcr_rt5651: Simplify card long-name 



Now that the headset-mic is always IN3 there is no reason to have
the headset-mic mapping in the long-name.

This commit simplifies the long name to "bytcr-rt5651-<intmic-map>-mic".

We can safely do this without causing regressions (UCM profile not found
due to the longname change) as the UCM profiles are not in upstream
alsa-lib yet.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 37c7401e

sound/soc/intel/boards/bytcr_rt5651.c

+4 −6
Original line number Diff line number Diff line
@@ -662,7 +662,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 char byt_rt5651_long_name[40]; /* = "bytcr-rt5651-*-mic" */



static bool is_valleyview(void)

{
@@ -683,8 +683,7 @@ 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", "in12" };

	const char * const hsmic_name[] = { "in3", "in3", "in3" };

	const char * const mic_name[] = { "dmic", "in1", "in12" };

	struct byt_rt5651_private *priv;

	struct snd_soc_acpi_mach *mach;

	const char *i2c_name = NULL;
@@ -831,9 +830,8 @@ 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)]);

		 "bytcr-rt5651-%s-mic",

		 mic_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);