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

Commit 7c441366 authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Greg Kroah-Hartman
Browse files

ASoC: tegra: Set driver_name=tegra for all machine drivers 



commit f6eb84fa596abf28959fc7e0b626f925eb1196c7 upstream.

The driver_name="tegra" is now required by the newer ALSA UCMs, otherwise
Tegra UCMs don't match by the path/name.

All Tegra machine drivers are specifying the card's name, but it has no
effect if model name is specified in the device-tree since it overrides
the card's name. We need to set the driver_name to "tegra" in order to
get a usable lookup path for the updated ALSA UCMs. The new UCM lookup
path has a form of driver_name/card_name.

The old lookup paths that are based on driver module name continue to
work as before. Note that UCM matching never worked for Tegra ASoC drivers
if they were compiled as built-in, this is fixed by supporting the new
naming scheme.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Link: https://lore.kernel.org/r/20210529154649.25936-2-digetx@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4341d292

sound/soc/tegra/tegra_alc5632.c

+1 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ static struct snd_soc_dai_link tegra_alc5632_dai = { 


static struct snd_soc_card snd_soc_tegra_alc5632 = {

	.name = "tegra-alc5632",

	.driver_name = "tegra",

	.owner = THIS_MODULE,

	.remove = tegra_alc5632_card_remove,

	.dai_link = &tegra_alc5632_dai,

sound/soc/tegra/tegra_max98090.c

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ static struct snd_soc_dai_link tegra_max98090_dai = { 


static struct snd_soc_card snd_soc_tegra_max98090 = {

	.name = "tegra-max98090",

	.driver_name = "tegra",

	.owner = THIS_MODULE,

	.remove = tegra_max98090_card_remove,

	.dai_link = &tegra_max98090_dai,

sound/soc/tegra/tegra_rt5640.c

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ static struct snd_soc_dai_link tegra_rt5640_dai = { 


static struct snd_soc_card snd_soc_tegra_rt5640 = {

	.name = "tegra-rt5640",

	.driver_name = "tegra",

	.owner = THIS_MODULE,

	.remove = tegra_rt5640_card_remove,

	.dai_link = &tegra_rt5640_dai,

sound/soc/tegra/tegra_rt5677.c

+1 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ static struct snd_soc_dai_link tegra_rt5677_dai = { 


static struct snd_soc_card snd_soc_tegra_rt5677 = {

	.name = "tegra-rt5677",

	.driver_name = "tegra",

	.owner = THIS_MODULE,

	.remove = tegra_rt5677_card_remove,

	.dai_link = &tegra_rt5677_dai,

sound/soc/tegra/tegra_sgtl5000.c

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ static struct snd_soc_dai_link tegra_sgtl5000_dai = { 


static struct snd_soc_card snd_soc_tegra_sgtl5000 = {

	.name = "tegra-sgtl5000",

	.driver_name = "tegra",

	.owner = THIS_MODULE,

	.dai_link = &tegra_sgtl5000_dai,

	.num_links = 1,