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 98d87801d57a76ec10fa01f901a6009a71f0f5e0..6fea7417332e25773f7ef7dd856bb698395f0ffa 100644 (file)
--- a/sound/soc/tegra/tegra_alc5632.c
+++ b/sound/soc/tegra/tegra_alc5632.c
@@ -137,6 +137,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 cf142e2c7bd796c1c993cfc64847ea7d29583606..10998d703dcd1f73d674966836d2afd46eb196c1 100644 (file)
--- a/sound/soc/tegra/tegra_max98090.c
+++ b/sound/soc/tegra/tegra_max98090.c
@@ -188,6 +188,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 fc81b48aa9d6afded35a7b7588c7e3142965e7cf..e0cbe85b6d461e1f4227ebe03297d06c0b72b36e 100644 (file)
--- a/sound/soc/tegra/tegra_rt5640.c
+++ b/sound/soc/tegra/tegra_rt5640.c
@@ -138,6 +138,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 7081f15302cc6ca3f31d62be5ebb724a91976220..e285793d2b1ca5c8cc53b515ba03845cf4112d2a 100644 (file)
--- a/sound/soc/tegra/tegra_rt5677.c
+++ b/sound/soc/tegra/tegra_rt5677.c
@@ -181,6 +181,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 901457da25ec3138bfca79359e6199576f89c979..e6cbc89eaa920731ae2cd1f58cdc6fc6772b5e6d 100644 (file)
--- a/sound/soc/tegra/tegra_sgtl5000.c
+++ b/sound/soc/tegra/tegra_sgtl5000.c
@@ -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,

diff --git a/sound/soc/tegra/tegra_wm8753.c b/sound/soc/tegra/tegra_wm8753.c
index 23a810e3bacc01c893be09e51c605c10d904cccd..3fa0e991308a6071ac1255616d9b3f0d8ce4a01b 100644 (file)
--- a/sound/soc/tegra/tegra_wm8753.c
+++ b/sound/soc/tegra/tegra_wm8753.c
@@ -110,6 +110,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 301850df368d6ed384d891f6e70498a51af1ccbc..8edcd82038d8d06892b165c6a82eaf8189ef2308 100644 (file)
--- a/sound/soc/tegra/tegra_wm8903.c
+++ b/sound/soc/tegra/tegra_wm8903.c
@@ -226,6 +226,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 864a3345972e5a17421ed904df58d61abf650338..7175e6eea9113cf94c2bba1fc3de2d648ed026a7 100644 (file)
--- a/sound/soc/tegra/tegra_wm9712.c
+++ b/sound/soc/tegra/tegra_wm9712.c
@@ -59,6 +59,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 99bcdd979eb2955cb484f773cbb1c1dcb6a830b4..47ef6d6f4ae1cc79fce20aebb73cb4e9dfb5368d 100644 (file)
--- a/sound/soc/tegra/trimslice.c
+++ b/sound/soc/tegra/trimslice.c
@@ -103,6 +103,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,