From: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Date: Thu, 19 Aug 2010 13:15:50 +0000 (+0200)
Subject: ASoC: Use a more adequate name for the CX20442 codec DAI
X-Git-Tag: firefly_0821_release~3680^2~2691^2~1226^2~476^2~15
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5394637a246f4709e6f9c62b6af2356f49ef46a7;p=firefly-linux-kernel-4.4.55.git
ASoC: Use a more adequate name for the CX20442 codec DAI
In the process of unification of codec DAI names while implementing
multi-component, the CX20442 codec DAI has been renamed to "cx20442-hifi".
This new name seems not adequate for a 8kHz voice codec.
Use a better name, "cx20442-voice", as suggested by Liam Girdwood.
Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
diff --git a/sound/soc/codecs/cx20442.c b/sound/soc/codecs/cx20442.c
index cf4323dbf9c4..e8d27c8f9ba3 100644
--- a/sound/soc/codecs/cx20442.c
+++ b/sound/soc/codecs/cx20442.c
@@ -318,7 +318,7 @@ EXPORT_SYMBOL_GPL(v253_ops);
*/
static struct snd_soc_dai_driver cx20442_dai = {
- .name = "cx20442-hifi",
+ .name = "cx20442-voice",
.playback = {
.stream_name = "Playback",
.channels_min = 1,
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c
index 9d88efa06e3c..438146addbb8 100644
--- a/sound/soc/omap/ams-delta.c
+++ b/sound/soc/omap/ams-delta.c
@@ -584,7 +584,7 @@ static struct snd_soc_dai_link ams_delta_dai_link = {
.name = "CX20442",
.stream_name = "CX20442",
.cpu_dai_name ="omap-mcbsp-dai.0",
- .codec_dai_name = "cx20442-hifi",
+ .codec_dai_name = "cx20442-voice",
.init = ams_delta_cx20442_init,
.platform_name = "omap-pcm-audio",
.codec_name = "cx20442-codec",