summaryrefslogtreecommitdiffstats
path: root/sound/soc/tegra
diff options
context:
space:
mode:
authorDmitry Osipenko <digetx@gmail.com>2021-05-29 18:46:48 +0300
committerMark Brown <broonie@kernel.org>2021-06-15 11:43:11 +0100
commitc16aab8ddc645f129880a266c1626b07b41f7c55 (patch)
tree9ed9f1554e86dc73651b59cf6a6fa6dc645a77e2 /sound/soc/tegra
parentcc8f70f5603986a99e7775f3cc4a10d337b82a4d (diff)
downloadlinux-c16aab8ddc645f129880a266c1626b07b41f7c55.tar.bz2
ASoC: tegra: Specify components string for each card
Specify components string for each card of each supported device. It's a free form string that describes audio hardware configuration. This information is useful for ALSA UCM rules. It allows to generalize UCM rules, potentially removing a need to add new UCM rule for each device. Acked-by: Jaroslav Kysela <perex@perex.cz> Suggested-by: Jaroslav Kysela <perex@perex.cz> Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Link: https://lore.kernel.org/r/20210529154649.25936-4-digetx@gmail.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/tegra')
-rw-r--r--sound/soc/tegra/tegra_asoc_machine.c7
-rw-r--r--sound/soc/tegra/tegra_wm8903.c1
2 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/tegra/tegra_asoc_machine.c b/sound/soc/tegra/tegra_asoc_machine.c
index f052ad2a1f38..31ab7123945b 100644
--- a/sound/soc/tegra/tegra_asoc_machine.c
+++ b/sound/soc/tegra/tegra_asoc_machine.c
@@ -412,6 +412,7 @@ static struct snd_soc_dai_link tegra_wm8753_dai = {
};
static struct snd_soc_card snd_soc_tegra_wm8753 = {
+ .components = "codec:wm8753",
.dai_link = &tegra_wm8753_dai,
.num_links = 1,
.fully_routed = true,
@@ -444,6 +445,7 @@ static struct snd_soc_dai_link tegra_wm9712_dai = {
};
static struct snd_soc_card snd_soc_tegra_wm9712 = {
+ .components = "codec:wm9712",
.dai_link = &tegra_wm9712_dai,
.num_links = 1,
.fully_routed = true,
@@ -506,6 +508,7 @@ static struct snd_soc_dai_link tegra_sgtl5000_dai = {
};
static struct snd_soc_card snd_soc_tegra_sgtl5000 = {
+ .components = "codec:sgtl5000",
.dai_link = &tegra_sgtl5000_dai,
.num_links = 1,
.fully_routed = true,
@@ -548,6 +551,7 @@ static struct snd_soc_dai_link tegra_tlv320aic23_dai = {
};
static struct snd_soc_card snd_soc_tegra_trimslice = {
+ .components = "codec:tlv320aic23",
.dai_link = &tegra_tlv320aic23_dai,
.num_links = 1,
.dapm_widgets = trimslice_dapm_widgets,
@@ -595,6 +599,7 @@ static struct snd_soc_dai_link tegra_rt5677_dai = {
};
static struct snd_soc_card snd_soc_tegra_rt5677 = {
+ .components = "codec:rt5677",
.dai_link = &tegra_rt5677_dai,
.num_links = 1,
.fully_routed = true,
@@ -628,6 +633,7 @@ static struct snd_soc_dai_link tegra_rt5640_dai = {
};
static struct snd_soc_card snd_soc_tegra_rt5640 = {
+ .components = "codec:rt5640",
.dai_link = &tegra_rt5640_dai,
.num_links = 1,
.fully_routed = true,
@@ -660,6 +666,7 @@ static struct snd_soc_dai_link tegra_rt5632_dai = {
};
static struct snd_soc_card snd_soc_tegra_rt5632 = {
+ .components = "codec:rt5632",
.dai_link = &tegra_rt5632_dai,
.num_links = 1,
.fully_routed = true,
diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c
index 74101d2c7785..5751fb398c1a 100644
--- a/sound/soc/tegra/tegra_wm8903.c
+++ b/sound/soc/tegra/tegra_wm8903.c
@@ -129,6 +129,7 @@ static struct snd_soc_dai_link tegra_wm8903_dai = {
};
static struct snd_soc_card snd_soc_tegra_wm8903 = {
+ .components = "codec:wm8903",
.owner = THIS_MODULE,
.dai_link = &tegra_wm8903_dai,
.num_links = 1,