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

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>

diff --git a/sound/soc/tegra/tegra_alc5632.c b/sound/soc/tegra/tegra_alc5632.c
index 0a0efd24e4b0f563eaa4831d39d4ad8bcf152fa6..81ea6ceba689af59b198de4dd20cea34adcf8b10 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 00c19704057b675bcf6201c61e0fffd6e403d309..5a649810c0c87623e26818fca0e9952687005a5c 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 9afba37a3b086a4896bfd73f44f056e8dd4fb6d6..3344f16258bec6c949a9b71ec4e75b0784188f7f 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 d30f8b6deda4b400da00705788e2b8ebb2d13033..0f03e97d935586f96d0e1c0ef1d55efbf6d77605 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 885332170c77b62abf14d3ee32ce1a06b9017af7..ef6a553e0b7da1727b2f2dccc33a207c8adc3520 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 efd79388668951c7295c6d51a8dc1cfbfaff0e07..27089077f2ea401063f3ca33d1f7adc45f0feb92 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 e4863fa37b0c6f0912e267fd1a58688b9b101d30..f219c26d66a31bf0c91c9a62d9164e20a1a56427 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 4f09a178049d33daf660c8d5f91584c3373189e6..c66da161c85aa82aee26823dc1bd67d7f82a6cdd 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 6c1cc3d0ac33631cf25ae46ce17ffc32b457cfcd..cb4c8f72e4e67ae1c32893285a4eaaa13e11b64f 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,