diff options
author | Mike Frysinger <vapier@gentoo.org> | 2011-03-28 01:45:09 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-03-29 18:17:50 -0400 |
commit | bfe4ee0a935dccf5980ecb5605c66fe50feb9056 (patch) | |
tree | 0c51caeb8581f383eb7a3dcd5fd756c4efeb8240 /sound/soc/blackfin/bf5xx-ad193x.c | |
parent | c8ad38b8b26ad04d5125606065c87315308d6df5 (diff) |
ASoC: Blackfin: standardize machine driver names
Some machine drivers were using "bf5xx-", others were using "bf5xx_",
while others were using "bfin-". Further, some were using the same
name in the transport layer which makes it hard to use different codecs
at the same time. So standardize all of them to "bfin-" and make sure
they are name spaced according to their driver name.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/blackfin/bf5xx-ad193x.c')
-rw-r--r-- | sound/soc/blackfin/bf5xx-ad193x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/blackfin/bf5xx-ad193x.c b/sound/soc/blackfin/bf5xx-ad193x.c index 5794d094d003..355094fad18a 100644 --- a/sound/soc/blackfin/bf5xx-ad193x.c +++ b/sound/soc/blackfin/bf5xx-ad193x.c | |||
@@ -110,15 +110,15 @@ static struct snd_soc_ops bf5xx_ad193x_ops = { | |||
110 | static struct snd_soc_dai_link bf5xx_ad193x_dai = { | 110 | static struct snd_soc_dai_link bf5xx_ad193x_dai = { |
111 | .name = "ad193x", | 111 | .name = "ad193x", |
112 | .stream_name = "AD193X", | 112 | .stream_name = "AD193X", |
113 | .cpu_dai_name = "bf5xx-tdm", | 113 | .cpu_dai_name = "bfin-tdm", |
114 | .codec_dai_name ="ad193x-hifi", | 114 | .codec_dai_name ="ad193x-hifi", |
115 | .platform_name = "bf5xx-tdm-pcm-audio", | 115 | .platform_name = "bfin-tdm-pcm-audio", |
116 | .codec_name = "ad193x.5", | 116 | .codec_name = "ad193x.5", |
117 | .ops = &bf5xx_ad193x_ops, | 117 | .ops = &bf5xx_ad193x_ops, |
118 | }; | 118 | }; |
119 | 119 | ||
120 | static struct snd_soc_card bf5xx_ad193x = { | 120 | static struct snd_soc_card bf5xx_ad193x = { |
121 | .name = "bf5xx_ad193x", | 121 | .name = "bfin-ad193x", |
122 | .dai_link = &bf5xx_ad193x_dai, | 122 | .dai_link = &bf5xx_ad193x_dai, |
123 | .num_links = 1, | 123 | .num_links = 1, |
124 | }; | 124 | }; |