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

Commit 22de71ba authored by Liam Girdwood's avatar Liam Girdwood Committed by Mark Brown
Browse files

ASoC: core - allow ASoC more flexible machine name 



Allow ASoC machine drivers to register a driver name
and a longname. This allows user space to determine
the flavour of machine driver.

Signed-off-by: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 9e53d856

include/sound/soc.h

+2 −0
Original line number Diff line number Diff line
@@ -702,6 +702,8 @@ struct snd_soc_aux_dev { 
/* SoC card */

struct snd_soc_card {

	const char *name;

	const char *long_name;

	const char *driver_name;

	struct device *dev;

	struct snd_card *snd_card;

	struct module *owner;

sound/soc/soc-core.c

+4 −2
Original line number Diff line number Diff line
@@ -1928,7 +1928,9 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card) 
	snprintf(card->snd_card->shortname, sizeof(card->snd_card->shortname),

		 "%s", card->name);

	snprintf(card->snd_card->longname, sizeof(card->snd_card->longname),

		 "%s", card->name);

		 "%s", card->long_name ? card->long_name : card->name);

	snprintf(card->snd_card->driver, sizeof(card->snd_card->driver),

		 "%s", card->driver_name);



	if (card->late_probe) {

		ret = card->late_probe(card);