aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/omap
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2014-04-16 08:46:26 -0400
committerMark Brown <broonie@linaro.org>2014-04-18 13:00:47 -0400
commitbffbe637aafa14cd30e5885eb0f1a59075a19452 (patch)
tree303542ceeced3b46a091f8d74a4b0848fc0dc57b /sound/soc/omap
parent7f46b0b5445ac4763512bd20dbed77edcc70a8cd (diff)
ASoC: omap3pandora: Use the same name for platform as the cpu_dai
Now that the platform driver is registered with the cpu_dai's device we can use the same name for it. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/omap')
-rw-r--r--sound/soc/omap/omap3pandora.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c
index 02181bb70400..076bec606d78 100644
--- a/sound/soc/omap/omap3pandora.c
+++ b/sound/soc/omap/omap3pandora.c
@@ -197,7 +197,7 @@ static struct snd_soc_dai_link omap3pandora_dai[] = {
197 .stream_name = "HiFi Out", 197 .stream_name = "HiFi Out",
198 .cpu_dai_name = "omap-mcbsp.2", 198 .cpu_dai_name = "omap-mcbsp.2",
199 .codec_dai_name = "twl4030-hifi", 199 .codec_dai_name = "twl4030-hifi",
200 .platform_name = "omap-pcm-audio", 200 .platform_name = "omap-mcbsp.2",
201 .codec_name = "twl4030-codec", 201 .codec_name = "twl4030-codec",
202 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | 202 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
203 SND_SOC_DAIFMT_CBS_CFS, 203 SND_SOC_DAIFMT_CBS_CFS,
@@ -208,7 +208,7 @@ static struct snd_soc_dai_link omap3pandora_dai[] = {
208 .stream_name = "Line/Mic In", 208 .stream_name = "Line/Mic In",
209 .cpu_dai_name = "omap-mcbsp.4", 209 .cpu_dai_name = "omap-mcbsp.4",
210 .codec_dai_name = "twl4030-hifi", 210 .codec_dai_name = "twl4030-hifi",
211 .platform_name = "omap-pcm-audio", 211 .platform_name = "omap-mcbsp.4",
212 .codec_name = "twl4030-codec", 212 .codec_name = "twl4030-codec",
213 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | 213 .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
214 SND_SOC_DAIFMT_CBS_CFS, 214 SND_SOC_DAIFMT_CBS_CFS,