forked from luck/tmp_suning_uos_patched
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>
This commit is contained in:
parent
e0d9beb44a
commit
ab9d7c5fc9
|
@ -139,6 +139,7 @@ static struct snd_soc_dai_link tegra_alc5632_dai = {
|
||||||
|
|
||||||
static struct snd_soc_card snd_soc_tegra_alc5632 = {
|
static struct snd_soc_card snd_soc_tegra_alc5632 = {
|
||||||
.name = "tegra-alc5632",
|
.name = "tegra-alc5632",
|
||||||
|
.driver_name = "tegra",
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.dai_link = &tegra_alc5632_dai,
|
.dai_link = &tegra_alc5632_dai,
|
||||||
.num_links = 1,
|
.num_links = 1,
|
||||||
|
|
|
@ -182,6 +182,7 @@ static struct snd_soc_dai_link tegra_max98090_dai = {
|
||||||
|
|
||||||
static struct snd_soc_card snd_soc_tegra_max98090 = {
|
static struct snd_soc_card snd_soc_tegra_max98090 = {
|
||||||
.name = "tegra-max98090",
|
.name = "tegra-max98090",
|
||||||
|
.driver_name = "tegra",
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.dai_link = &tegra_max98090_dai,
|
.dai_link = &tegra_max98090_dai,
|
||||||
.num_links = 1,
|
.num_links = 1,
|
||||||
|
|
|
@ -132,6 +132,7 @@ static struct snd_soc_dai_link tegra_rt5640_dai = {
|
||||||
|
|
||||||
static struct snd_soc_card snd_soc_tegra_rt5640 = {
|
static struct snd_soc_card snd_soc_tegra_rt5640 = {
|
||||||
.name = "tegra-rt5640",
|
.name = "tegra-rt5640",
|
||||||
|
.driver_name = "tegra",
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.dai_link = &tegra_rt5640_dai,
|
.dai_link = &tegra_rt5640_dai,
|
||||||
.num_links = 1,
|
.num_links = 1,
|
||||||
|
|
|
@ -175,6 +175,7 @@ static struct snd_soc_dai_link tegra_rt5677_dai = {
|
||||||
|
|
||||||
static struct snd_soc_card snd_soc_tegra_rt5677 = {
|
static struct snd_soc_card snd_soc_tegra_rt5677 = {
|
||||||
.name = "tegra-rt5677",
|
.name = "tegra-rt5677",
|
||||||
|
.driver_name = "tegra",
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.dai_link = &tegra_rt5677_dai,
|
.dai_link = &tegra_rt5677_dai,
|
||||||
.num_links = 1,
|
.num_links = 1,
|
||||||
|
|
|
@ -97,6 +97,7 @@ static struct snd_soc_dai_link tegra_sgtl5000_dai = {
|
||||||
|
|
||||||
static struct snd_soc_card snd_soc_tegra_sgtl5000 = {
|
static struct snd_soc_card snd_soc_tegra_sgtl5000 = {
|
||||||
.name = "tegra-sgtl5000",
|
.name = "tegra-sgtl5000",
|
||||||
|
.driver_name = "tegra",
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.dai_link = &tegra_sgtl5000_dai,
|
.dai_link = &tegra_sgtl5000_dai,
|
||||||
.num_links = 1,
|
.num_links = 1,
|
||||||
|
|
|
@ -101,6 +101,7 @@ static struct snd_soc_dai_link tegra_wm8753_dai = {
|
||||||
|
|
||||||
static struct snd_soc_card snd_soc_tegra_wm8753 = {
|
static struct snd_soc_card snd_soc_tegra_wm8753 = {
|
||||||
.name = "tegra-wm8753",
|
.name = "tegra-wm8753",
|
||||||
|
.driver_name = "tegra",
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.dai_link = &tegra_wm8753_dai,
|
.dai_link = &tegra_wm8753_dai,
|
||||||
.num_links = 1,
|
.num_links = 1,
|
||||||
|
|
|
@ -235,6 +235,7 @@ static struct snd_soc_dai_link tegra_wm8903_dai = {
|
||||||
|
|
||||||
static struct snd_soc_card snd_soc_tegra_wm8903 = {
|
static struct snd_soc_card snd_soc_tegra_wm8903 = {
|
||||||
.name = "tegra-wm8903",
|
.name = "tegra-wm8903",
|
||||||
|
.driver_name = "tegra",
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.dai_link = &tegra_wm8903_dai,
|
.dai_link = &tegra_wm8903_dai,
|
||||||
.num_links = 1,
|
.num_links = 1,
|
||||||
|
|
|
@ -54,6 +54,7 @@ static struct snd_soc_dai_link tegra_wm9712_dai = {
|
||||||
|
|
||||||
static struct snd_soc_card snd_soc_tegra_wm9712 = {
|
static struct snd_soc_card snd_soc_tegra_wm9712 = {
|
||||||
.name = "tegra-wm9712",
|
.name = "tegra-wm9712",
|
||||||
|
.driver_name = "tegra",
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.dai_link = &tegra_wm9712_dai,
|
.dai_link = &tegra_wm9712_dai,
|
||||||
.num_links = 1,
|
.num_links = 1,
|
||||||
|
|
|
@ -94,6 +94,7 @@ static struct snd_soc_dai_link trimslice_tlv320aic23_dai = {
|
||||||
|
|
||||||
static struct snd_soc_card snd_soc_trimslice = {
|
static struct snd_soc_card snd_soc_trimslice = {
|
||||||
.name = "tegra-trimslice",
|
.name = "tegra-trimslice",
|
||||||
|
.driver_name = "tegra",
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.dai_link = &trimslice_tlv320aic23_dai,
|
.dai_link = &trimslice_tlv320aic23_dai,
|
||||||
.num_links = 1,
|
.num_links = 1,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user