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

Unverified Commit f11a5c27 authored by Liam Girdwood's avatar Liam Girdwood Committed by Mark Brown
Browse files

ASoC: core: Add name prefix for machines with topology rewrites 



Signed-off-by: default avatarLiam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 45f8cb57

include/sound/soc.h

+2 −0
Original line number Diff line number Diff line
@@ -1015,6 +1015,7 @@ struct snd_soc_platform_driver { 


	/* this platform uses topology and ignore machine driver FEs */

	const char *ignore_machine;

	const char *topology_name_prefix;

	int (*be_hw_params_fixup)(struct snd_soc_pcm_runtime *rtd,

				  struct snd_pcm_hw_params *params);

	bool use_dai_pcm_id;	/* use the DAI link PCM ID as PCM device number */
@@ -1167,6 +1168,7 @@ struct snd_soc_card { 
	const char *long_name;

	const char *driver_name;

	char dmi_longname[80];

	char topology_shortname[32];



	struct device *dev;

	struct snd_card *snd_card;

sound/soc/soc-core.c

+8 −0
Original line number Diff line number Diff line
@@ -2143,6 +2143,14 @@ static void soc_check_tplg_fes(struct snd_soc_card *card) 
			if (!dai_link->stream_name)

				dai_link->stream_name = dai_link->name;

		}



		/* Inform userspace we are using alternate topology */

		if (platform->driver->topology_name_prefix) {

			snprintf(card->topology_shortname, 32, "%s-%s",

				 platform->driver->topology_name_prefix,

				 card->name);

			card->name = card->topology_shortname;

		}

	}

}