summaryrefslogtreecommitdiffstats
path: root/sound/soc/ux500/mop500.c
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2012-11-23 14:05:41 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-11-23 15:06:02 +0100
commit1428c20f7c38e9fbf59923d1b9615ebdaf2862b7 (patch)
tree9b946dc80e618243e5895f5b3fcdda8e746a6146 /sound/soc/ux500/mop500.c
parentASoC: Ux500: Control apb clock (diff)
downloadlinux-1428c20f7c38e9fbf59923d1b9615ebdaf2862b7.tar.xz
linux-1428c20f7c38e9fbf59923d1b9615ebdaf2862b7.zip
ASoC: Ux500: Initialise PCM from MSP probe rather than as a device
The PCM is a pseudo-device. It doesn't have any of it's own registers or hardware. It rather acts as a layer of abstraction for DMA transfers. Hence, instead of classifying it as a device in its own right, we call the initialisation from the MSP driver. Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: Ola LILJA2 <ola.o.lilja@stericsson.com> Cc: alsa-devel@alsa-project.org Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/ux500/mop500.c')
-rw-r--r--sound/soc/ux500/mop500.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/ux500/mop500.c b/sound/soc/ux500/mop500.c
index 356611d9654d..6f67e6b2582d 100644
--- a/sound/soc/ux500/mop500.c
+++ b/sound/soc/ux500/mop500.c
@@ -33,7 +33,7 @@ struct snd_soc_dai_link mop500_dai_links[] = {
.stream_name = "ab8500_0",
.cpu_dai_name = "ux500-msp-i2s.1",
.codec_dai_name = "ab8500-codec-dai.0",
- .platform_name = "ux500-pcm.0",
+ .platform_name = "ux500-msp-i2s.1",
.codec_name = "ab8500-codec.0",
.init = mop500_ab8500_machine_init,
.ops = mop500_ab8500_ops,
@@ -43,7 +43,7 @@ struct snd_soc_dai_link mop500_dai_links[] = {
.stream_name = "ab8500_1",
.cpu_dai_name = "ux500-msp-i2s.3",
.codec_dai_name = "ab8500-codec-dai.1",
- .platform_name = "ux500-pcm.0",
+ .platform_name = "ux500-msp-i2s.3",
.codec_name = "ab8500-codec.0",
.init = NULL,
.ops = mop500_ab8500_ops,