summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorSumit Bhattacharya <sumitb@nvidia.com>2011-08-11 14:47:59 +0530
committerVarun Colbert <vcolbert@nvidia.com>2011-08-12 17:34:36 -0700
commitbd0bf9a8d98f313491e1dda9f915d4add1d98580 (patch)
tree2b958776e585da375b63305fb161af8379910f7a /sound
parent5c90c87c113c6fc8160dde9df56797fa51bdc0c9 (diff)
ASoC: Tegra: Use unique card name
Bug 862023 Change-Id: Ib8fd1f35889d7f6a081b47df51b66c3d06e53f8d Reviewed-on: http://git-master/r/46618 Tested-by: Sumit Bhattacharya <sumitb@nvidia.com> Reviewed-by: Nitin Pai <npai@nvidia.com> Reviewed-by: Scott Peterson <speterson@nvidia.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/tegra/tegra_soc_ad193x.c2
-rw-r--r--sound/soc/tegra/tegra_soc_generic_codec.c2
-rw-r--r--sound/soc/tegra/tegra_soc_max98088.c2
-rw-r--r--sound/soc/tegra/tegra_soc_wm8753.c2
-rw-r--r--sound/soc/tegra/tegra_soc_wm8903.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/tegra/tegra_soc_ad193x.c b/sound/soc/tegra/tegra_soc_ad193x.c
index b52a172b231f..360231527ac5 100644
--- a/sound/soc/tegra/tegra_soc_ad193x.c
+++ b/sound/soc/tegra/tegra_soc_ad193x.c
@@ -212,7 +212,7 @@ static struct tegra_audio_data audio_data = {
};
static struct snd_soc_card tegra_snd_soc = {
- .name = "tegra",
+ .name = "tegra-ad193x",
.platform = &tegra_soc_platform,
.dai_link = tegra_soc_dai,
.num_links = ARRAY_SIZE(tegra_soc_dai),
diff --git a/sound/soc/tegra/tegra_soc_generic_codec.c b/sound/soc/tegra/tegra_soc_generic_codec.c
index 343e834d02a4..7cdb6b03983f 100644
--- a/sound/soc/tegra/tegra_soc_generic_codec.c
+++ b/sound/soc/tegra/tegra_soc_generic_codec.c
@@ -189,7 +189,7 @@ static struct tegra_audio_data audio_data = {
};
static struct snd_soc_card tegra_snd_soc = {
- .name = "tegra",
+ .name = "tegra-generic",
.platform = &tegra_soc_platform,
.dai_link = tegra_soc_dai,
.num_links = ARRAY_SIZE(tegra_soc_dai),
diff --git a/sound/soc/tegra/tegra_soc_max98088.c b/sound/soc/tegra/tegra_soc_max98088.c
index b19f709b1dc9..3d247fac3156 100644
--- a/sound/soc/tegra/tegra_soc_max98088.c
+++ b/sound/soc/tegra/tegra_soc_max98088.c
@@ -419,7 +419,7 @@ static struct tegra_audio_data audio_data = {
};
static struct snd_soc_card tegra_snd_soc = {
- .name = "tegra",
+ .name = "tegra-max98088",
.platform = &tegra_soc_platform,
.dai_link = tegra_soc_dai,
.num_links = ARRAY_SIZE(tegra_soc_dai),
diff --git a/sound/soc/tegra/tegra_soc_wm8753.c b/sound/soc/tegra/tegra_soc_wm8753.c
index 72c5751f50a4..ab4e884047dc 100644
--- a/sound/soc/tegra/tegra_soc_wm8753.c
+++ b/sound/soc/tegra/tegra_soc_wm8753.c
@@ -751,7 +751,7 @@ static struct tegra_audio_data audio_data = {
};
static struct snd_soc_card tegra_snd_soc = {
- .name = "tegra",
+ .name = "tegra-wm8753",
.platform = &tegra_soc_platform,
.dai_link = tegra_soc_dai,
.num_links = ARRAY_SIZE(tegra_soc_dai),
diff --git a/sound/soc/tegra/tegra_soc_wm8903.c b/sound/soc/tegra/tegra_soc_wm8903.c
index 4e747fa8b100..7971496fb617 100644
--- a/sound/soc/tegra/tegra_soc_wm8903.c
+++ b/sound/soc/tegra/tegra_soc_wm8903.c
@@ -588,7 +588,7 @@ static struct tegra_audio_data audio_data = {
};
static struct snd_soc_card tegra_snd_soc = {
- .name = "tegra",
+ .name = "tegra-wm8903",
.platform = &tegra_soc_platform,
.dai_link = tegra_soc_dai,
.num_links = ARRAY_SIZE(tegra_soc_dai),