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: Dmitry Osipenko <digetx@gmail.com>
Link: https://lore.kernel.org/r/20210529154649.25936-2-digetx@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/sound/soc/tegra/tegra_alc5632.c b/sound/soc/tegra/tegra_alc5632.c
index 8661877bf4c6f7cd2e4a3c9bd96bf30d913cf65a..13a956c6077b88eae6a835dd1a6a4ab1bcedee2c 100644 (file)
--- a/sound/soc/tegra/tegra_alc5632.c
+++ b/sound/soc/tegra/tegra_alc5632.c
@@ -139,6 +139,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,
        .dai_link = &tegra_alc5632_dai,
        .num_links = 1,

diff --git a/sound/soc/tegra/tegra_max98090.c b/sound/soc/tegra/tegra_max98090.c
index 9d8e16473ab991abcc13563b0c2f7cabad6a3abc..2fdf46bad2bff558e70b7ced2779537a623554a3 100644 (file)
--- a/sound/soc/tegra/tegra_max98090.c
+++ b/sound/soc/tegra/tegra_max98090.c
@@ -182,6 +182,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,
        .dai_link = &tegra_max98090_dai,
        .num_links = 1,

diff --git a/sound/soc/tegra/tegra_rt5640.c b/sound/soc/tegra/tegra_rt5640.c
index c73bd23b3d679e1a203cb424e4ec1cf7465e25ca..6c2689f5da2240b2f2e0fbfe3a8df6c5047c2752 100644 (file)
--- a/sound/soc/tegra/tegra_rt5640.c
+++ b/sound/soc/tegra/tegra_rt5640.c
@@ -132,6 +132,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,
        .dai_link = &tegra_rt5640_dai,
        .num_links = 1,

diff --git a/sound/soc/tegra/tegra_rt5677.c b/sound/soc/tegra/tegra_rt5677.c
index 7504507dd8b855772e54beceb8e78fdb5aeb7129..0588889d081a53abb8135ec2db05e3406d5c72d9 100644 (file)
--- a/sound/soc/tegra/tegra_rt5677.c
+++ b/sound/soc/tegra/tegra_rt5677.c
@@ -175,6 +175,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,
        .dai_link = &tegra_rt5677_dai,
        .num_links = 1,

diff --git a/sound/soc/tegra/tegra_sgtl5000.c b/sound/soc/tegra/tegra_sgtl5000.c
index e1dc8e7d337a2335ec2ffc72c2ee9dc7bf92ee8a..3d35a57d8c0c4065ea49b3b6f9288ac3c384a5b3 100644 (file)
--- a/sound/soc/tegra/tegra_sgtl5000.c
+++ b/sound/soc/tegra/tegra_sgtl5000.c
@@ -97,6 +97,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,

diff --git a/sound/soc/tegra/tegra_wm8753.c b/sound/soc/tegra/tegra_wm8753.c
index fa41fa366dafaf60338523d8a8532523e42928ab..bdddda4eb91390f3cf2e6cbe11d56cbf84b34316 100644 (file)
--- a/sound/soc/tegra/tegra_wm8753.c
+++ b/sound/soc/tegra/tegra_wm8753.c
@@ -101,6 +101,7 @@ static struct snd_soc_dai_link tegra_wm8753_dai = {
 
 static struct snd_soc_card snd_soc_tegra_wm8753 = {
        .name = "tegra-wm8753",
+       .driver_name = "tegra",
        .owner = THIS_MODULE,
        .dai_link = &tegra_wm8753_dai,
        .num_links = 1,

diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c
index ef6652aaac9b6ef9d57e75297f4cba4b3c5cde33..98adf93fb898d125160614347326ecf344a18621 100644 (file)
--- a/sound/soc/tegra/tegra_wm8903.c
+++ b/sound/soc/tegra/tegra_wm8903.c
@@ -235,6 +235,7 @@ static struct snd_soc_dai_link tegra_wm8903_dai = {
 
 static struct snd_soc_card snd_soc_tegra_wm8903 = {
        .name = "tegra-wm8903",
+       .driver_name = "tegra",
        .owner = THIS_MODULE,
        .dai_link = &tegra_wm8903_dai,
        .num_links = 1,

diff --git a/sound/soc/tegra/tegra_wm9712.c b/sound/soc/tegra/tegra_wm9712.c
index 726edfa21a29d07b194a194ad3f805349ba150f1..df7662258bc6dd05cb8aa2114b50c73abea3d1af 100644 (file)
--- a/sound/soc/tegra/tegra_wm9712.c
+++ b/sound/soc/tegra/tegra_wm9712.c
@@ -54,6 +54,7 @@ static struct snd_soc_dai_link tegra_wm9712_dai = {
 
 static struct snd_soc_card snd_soc_tegra_wm9712 = {
        .name = "tegra-wm9712",
+       .driver_name = "tegra",
        .owner = THIS_MODULE,
        .dai_link = &tegra_wm9712_dai,
        .num_links = 1,

diff --git a/sound/soc/tegra/trimslice.c b/sound/soc/tegra/trimslice.c
index baae4cce7fc66710dd8cda2dc1fcc10199290028..d8fbb22482d5fae0a0ae609dde63d56d5b292d0a 100644 (file)
--- a/sound/soc/tegra/trimslice.c
+++ b/sound/soc/tegra/trimslice.c
@@ -94,6 +94,7 @@ static struct snd_soc_dai_link trimslice_tlv320aic23_dai = {
 
 static struct snd_soc_card snd_soc_trimslice = {
        .name = "tegra-trimslice",
+       .driver_name = "tegra",
        .owner = THIS_MODULE,
        .dai_link = &trimslice_tlv320aic23_dai,
        .num_links = 1,