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-ad73311.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-ad73311.c')
-rw-r--r-- | sound/soc/blackfin/bf5xx-ad73311.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/blackfin/bf5xx-ad73311.c b/sound/soc/blackfin/bf5xx-ad73311.c index 1655f950dfb4..9f0d4f3c590f 100644 --- a/sound/soc/blackfin/bf5xx-ad73311.c +++ b/sound/soc/blackfin/bf5xx-ad73311.c | |||
@@ -183,15 +183,15 @@ static struct snd_soc_ops bf5xx_ad73311_ops = { | |||
183 | static struct snd_soc_dai_link bf5xx_ad73311_dai = { | 183 | static struct snd_soc_dai_link bf5xx_ad73311_dai = { |
184 | .name = "ad73311", | 184 | .name = "ad73311", |
185 | .stream_name = "AD73311", | 185 | .stream_name = "AD73311", |
186 | .cpu_dai_name = "bf5xx-i2s", | 186 | .cpu_dai_name = "bfin-i2s", |
187 | .codec_dai_name = "ad73311-hifi", | 187 | .codec_dai_name = "ad73311-hifi", |
188 | .platform_name = "bfin-pcm-audio", | 188 | .platform_name = "bfin-i2s-pcm-audio", |
189 | .codec_name = "ad73311", | 189 | .codec_name = "ad73311", |
190 | .ops = &bf5xx_ad73311_ops, | 190 | .ops = &bf5xx_ad73311_ops, |
191 | }; | 191 | }; |
192 | 192 | ||
193 | static struct snd_soc_card bf5xx_ad73311 = { | 193 | static struct snd_soc_card bf5xx_ad73311 = { |
194 | .name = "bf5xx_ad73311", | 194 | .name = "bfin-ad73311", |
195 | .probe = bf5xx_probe, | 195 | .probe = bf5xx_probe, |
196 | .dai_link = &bf5xx_ad73311_dai, | 196 | .dai_link = &bf5xx_ad73311_dai, |
197 | .num_links = 1, | 197 | .num_links = 1, |