summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorJanusz Krzysztofik <jkrzyszt@tis.icnet.pl>2010-08-19 15:15:50 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-08-19 15:30:43 +0100
commit5394637a246f4709e6f9c62b6af2356f49ef46a7 (patch)
tree2de0674ff6f501cfc52eee0ecd2c64234b54daf0 /sound/soc
parent140176159597ea1f23dcccb47b5c38fdf7c7faa8 (diff)
downloadlinux-5394637a246f4709e6f9c62b6af2356f49ef46a7.tar.gz
linux-5394637a246f4709e6f9c62b6af2356f49ef46a7.tar.bz2
linux-5394637a246f4709e6f9c62b6af2356f49ef46a7.zip
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>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/cx20442.c2
-rw-r--r--sound/soc/omap/ams-delta.c2
2 files changed, 2 insertions, 2 deletions
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",