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

Unverified Commit 249d2fc9 authored by Hans de Goede's avatar Hans de Goede Committed by Mark Brown
Browse files

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



Depending on the input-map and on if 1 or 2 speakers are connected,
userspace needs to use a different UCM profile.

Since we already deal with quirks in the kernel driver and set the
input-map from the kernel, add a quirk for devices with a single / mono
speaker and set the card's long_name based on the input and speaker
quirks, so that userspace can use the long_name to pick the right UCM
profile.

This change, including how the long_name is build-up mirrors how we do
this in the bytcr_rt5640 and bytcr_rt5651 machine drivers.

Note since all devices I have access to use a mono speaker setup I've
chosen to default the speaker setting to mono.

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

sound/soc/intel/boards/bytcht_es8316.c

+15 −4
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ enum { 


#define BYT_CHT_ES8316_MAP(quirk)		((quirk) & GENMASK(3, 0))

#define BYT_CHT_ES8316_SSP0			BIT(16)

#define BYT_CHT_ES8316_MONO_SPEAKER		BIT(17)



static int quirk;
@@ -69,6 +70,8 @@ static void log_quirks(struct device *dev) 
		dev_info(dev, "quirk IN2_MAP enabled");

	if (quirk & BYT_CHT_ES8316_SSP0)

		dev_info(dev, "quirk SSP0 enabled");

	if (quirk & BYT_CHT_ES8316_MONO_SPEAKER)

		dev_info(dev, "quirk MONO_SPEAKER enabled\n");

}



static int byt_cht_es8316_speaker_power_event(struct snd_soc_dapm_widget *w,
@@ -352,6 +355,7 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = { 


/* SoC card */

static char codec_name[SND_ACPI_I2C_ID_LEN];

static char long_name[50]; /* = "bytcht-es8316-*-spk-*-mic" */



static int byt_cht_es8316_suspend(struct snd_soc_card *card)

{
@@ -433,6 +437,7 @@ static const struct acpi_gpio_mapping byt_cht_es8316_gpios[] = { 


static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev)

{

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

	struct byt_cht_es8316_private *priv;

	struct device *dev = &pdev->dev;

	struct snd_soc_acpi_mach *mach;
@@ -467,11 +472,13 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) 
	/* Check for BYTCR or other platform and setup quirks */

	if (x86_match_cpu(baytrail_cpu_ids) &&

	    mach->mach_params.acpi_ipc_irq_index == 0) {

		/* On BYTCR default to SSP0, internal-mic-in2-map */

		quirk = BYT_CHT_ES8316_SSP0 | BYT_CHT_ES8316_INTMIC_IN2_MAP;

		/* On BYTCR default to SSP0, internal-mic-in2-map, mono-spk */

		quirk = BYT_CHT_ES8316_SSP0 | BYT_CHT_ES8316_INTMIC_IN2_MAP |

			BYT_CHT_ES8316_MONO_SPEAKER;

	} else {

		/* Others default to internal-mic-in1-map */

		quirk = BYT_CHT_ES8316_INTMIC_IN1_MAP;

		/* Others default to internal-mic-in1-map, mono-speaker */

		quirk = BYT_CHT_ES8316_INTMIC_IN1_MAP |

			BYT_CHT_ES8316_MONO_SPEAKER;

	}

	if (quirk_override != -1) {

		dev_info(dev, "Overriding quirk 0x%x => 0x%x\n", quirk,
@@ -518,6 +525,10 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) 
	}



	/* register the soc card */

	snprintf(long_name, sizeof(long_name), "bytcht-es8316-%s-spk-%s-mic",

		 (quirk & BYT_CHT_ES8316_MONO_SPEAKER) ? "mono" : "stereo",

		 mic_name[BYT_CHT_ES8316_MAP(quirk)]);

	byt_cht_es8316_card.long_name = long_name;

	byt_cht_es8316_card.dev = dev;

	snd_soc_card_set_drvdata(&byt_cht_es8316_card, priv);