summaryrefslogtreecommitdiffstats
path: root/sound/soc/blackfin/bf5xx-ad73311.c
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-03-28 01:45:09 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-03-30 07:17:50 +0900
commitbfe4ee0a935dccf5980ecb5605c66fe50feb9056 (patch)
tree0c51caeb8581f383eb7a3dcd5fd756c4efeb8240 /sound/soc/blackfin/bf5xx-ad73311.c
parentc8ad38b8b26ad04d5125606065c87315308d6df5 (diff)
downloadop-kernel-dev-bfe4ee0a935dccf5980ecb5605c66fe50feb9056.zip
op-kernel-dev-bfe4ee0a935dccf5980ecb5605c66fe50feb9056.tar.gz
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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/blackfin/bf5xx-ad73311.c b/sound/soc/blackfin/bf5xx-ad73311.c
index 1655f95..9f0d4f3 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 = {
static struct snd_soc_dai_link bf5xx_ad73311_dai = {
.name = "ad73311",
.stream_name = "AD73311",
- .cpu_dai_name = "bf5xx-i2s",
+ .cpu_dai_name = "bfin-i2s",
.codec_dai_name = "ad73311-hifi",
- .platform_name = "bfin-pcm-audio",
+ .platform_name = "bfin-i2s-pcm-audio",
.codec_name = "ad73311",
.ops = &bf5xx_ad73311_ops,
};
static struct snd_soc_card bf5xx_ad73311 = {
- .name = "bf5xx_ad73311",
+ .name = "bfin-ad73311",
.probe = bf5xx_probe,
.dai_link = &bf5xx_ad73311_dai,
.num_links = 1,
OpenPOWER on IntegriCloud