summaryrefslogtreecommitdiff
path: root/sound/soc/imx/wm1133-ev1.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-09-30 13:46:14 -0700
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-10-01 00:13:28 -0700
commit205d231bfbd26bb10400518586d2a9f1b62858ee (patch)
treeb4b53b06805aabbfb0ebccae423e5084d92d874c /sound/soc/imx/wm1133-ev1.c
parentd330a080a87831b693a2dad1058cd11bbb6c3736 (diff)
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/wm1133-ev1.c')
-rw-r--r--sound/soc/imx/wm1133-ev1.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/imx/wm1133-ev1.c b/sound/soc/imx/wm1133-ev1.c
index 74068636c1d8..30fdb15065be 100644
--- a/sound/soc/imx/wm1133-ev1.c
+++ b/sound/soc/imx/wm1133-ev1.c
@@ -243,7 +243,7 @@ static int wm1133_ev1_init(struct snd_soc_pcm_runtime *rtd)
static struct snd_soc_dai_link wm1133_ev1_dai = {
.name = "WM1133-EV1",
.stream_name = "Audio",
- .cpu_dai_name = "imx-ssi-dai.0",
+ .cpu_dai_name = "imx-ssi.0",
.codec_dai_name = "wm8350-hifi",
.platform_name = "imx-fiq-pcm-audio.0",
.codec_name = "wm8350-codec.0-0x1a",