[alsa-devel] [PATCH 19/19] ASoC: Intel: bytcr_rt5640: Set card long_name based on quirks

[Pierre-Louis Bossart]

On 5/8/18 10:36 AM, Hans de Goede wrote:
> Many X86 devices using a BYT SoC + RT5640 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 only uses inputs / outputs which are actually hooked up
> on the device.
> 
> Our quirks already specify which input the internal mic is connected to
> and if a single (mono) speaker is used or if the device has stereo
> speakers.
> 
> 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.

Isn't this going to be complicated to manage for UCM? Just with this 
patch alone, you'd need 8 UCM files to cover all the combinations. 16 if 
you add the 'sof-' prefix.

seems like UCM should become more 'dynamic' and get quirk information 
somehow (sysfs?) to enable/disable endpoints rather than rely on name 
encoding to select the right profile?

> 
> 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: Hans de Goede <hdegoede at redhat.com>
> ---
>   sound/soc/intel/boards/bytcr_rt5640.c | 9 +++++++++
>   1 file changed, 9 insertions(+)
> 
> diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
> index cfc520200214..9a1204dcdbc6 100644
> --- a/sound/soc/intel/boards/bytcr_rt5640.c
> +++ b/sound/soc/intel/boards/bytcr_rt5640.c
> @@ -929,6 +929,7 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = {
>   static char byt_rt5640_codec_name[SND_ACPI_I2C_ID_LEN];
>   static char byt_rt5640_codec_aif_name[12]; /*  = "rt5640-aif[1|2]" */
>   static char byt_rt5640_cpu_dai_name[10]; /*  = "ssp[0|2]-port" */
> +static char byt_rt5640_long_name[40]; /* = "bytcr-rt5640-*-spk-*-mic" */
>   
>   static int byt_rt5640_suspend(struct snd_soc_card *card)
>   {
> @@ -1000,6 +1001,7 @@ struct acpi_chan_package {   /* ACPICA seems to require 64 bit integers */
>   
>   static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
>   {
> +	const char * const map_name[] = { "dmic1", "dmic2", "in1", "in3" };
>   	const struct dmi_system_id *dmi_id;
>   	struct byt_rt5640_private *priv;
>   	struct snd_soc_acpi_mach *mach;
> @@ -1163,6 +1165,13 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
>   		}
>   	}
>   
> +	snprintf(byt_rt5640_long_name, sizeof(byt_rt5640_long_name),
> +		 "bytcr-rt5640-%s-spk-%s-mic",
> +		 (byt_rt5640_quirk & BYT_RT5640_MONO_SPEAKER) ?
> +			"mono" : "stereo",
> +		 map_name[BYT_RT5640_MAP(byt_rt5640_quirk)]);
> +	byt_rt5640_card.long_name = byt_rt5640_long_name;
> +
>   	ret_val = devm_snd_soc_register_card(&pdev->dev, &byt_rt5640_card);
>   
>   	if (ret_val) {
>