summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2013-12-19 15:55:01 +0000
committerMark Brown <broonie@linaro.org>2014-01-07 15:37:19 +0000
commitae276e93b8ccb933c8cfca368427d1eafd07128d (patch)
tree8f9982eb5e5876c41525e4b6d3f058286f579537 /sound
parenta61f9e314ad8ab9434ddd989b857ed93fdc725e2 (diff)
downloadlinux-stable-ae276e93b8ccb933c8cfca368427d1eafd07128d.tar.gz
linux-stable-ae276e93b8ccb933c8cfca368427d1eafd07128d.tar.bz2
linux-stable-ae276e93b8ccb933c8cfca368427d1eafd07128d.zip
ASoC: Ux500: Match platform by device node when booting Device Tree
We're getting closer to fully enabling the Ux500 ASoC driver for Device Tree. When we switch over from using AUXDATA we'll need to match platform by only Device Tree nodes. In this patch we NULL out the platform_name, and supply nodes for each platform device. Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/ux500/mop500.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/ux500/mop500.c b/sound/soc/ux500/mop500.c
index 178d1bad6259..b3b66aa98dce 100644
--- a/sound/soc/ux500/mop500.c
+++ b/sound/soc/ux500/mop500.c
@@ -91,6 +91,8 @@ static int mop500_of_probe(struct platform_device *pdev,
for (i = 0; i < 2; i++) {
mop500_dai_links[i].cpu_of_node = msp_np[i];
mop500_dai_links[i].cpu_dai_name = NULL;
+ mop500_dai_links[i].platform_of_node = msp_np[i];
+ mop500_dai_links[i].platform_name = NULL;
mop500_dai_links[i].codec_of_node = codec_np;
mop500_dai_links[i].codec_name = NULL;
}