summaryrefslogtreecommitdiff
path: root/sound/soc/imx/phycore-ac97.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-09-30 20:46:14 (GMT)
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-10-01 07:13:28 (GMT)
commit205d231bfbd26bb10400518586d2a9f1b62858ee (patch)
treeb4b53b06805aabbfb0ebccae423e5084d92d874c /sound/soc/imx/phycore-ac97.c
parentd330a080a87831b693a2dad1058cd11bbb6c3736 (diff)
downloadlinux-205d231bfbd26bb10400518586d2a9f1b62858ee.tar.xz
ASoC: Remove -dai suffix from i.MX SSI driver
While it is a generic serial port in practice the i.MX SSI is only supported in Linux as an audio port (the i.MX has dedicated SPI controllers and so on). This means we don't need to disambiguate against other uses of the hardware and so can drop the -dai suffix from the driver name which fixes merge issues with the i.MX tree in -next. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc/imx/phycore-ac97.c')
-rw-r--r--sound/soc/imx/phycore-ac97.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/imx/phycore-ac97.c b/sound/soc/imx/phycore-ac97.c
index 65f0f99..6a65dd7 100644
--- a/sound/soc/imx/phycore-ac97.c
+++ b/sound/soc/imx/phycore-ac97.c
@@ -34,7 +34,7 @@ static struct snd_soc_dai_link imx_phycore_dai_ac97[] = {
.stream_name = "HiFi",
.codec_dai_name = "wm9712-hifi",
.codec_name = "wm9712-codec",
- .cpu_dai_name = "imx-ssi-dai.0",
+ .cpu_dai_name = "imx-ssi.0",
.platform_name = "imx-fiq-pcm-audio.0",
.ops = &imx_phycore_hifi_ops,
},