aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2018-04-27 11:17:13 +0300
committerMark Brown <broonie@kernel.org>2018-04-27 11:57:19 +0100
commit6f4a7594a6271b61f06382c0d4ec0525016edec6 (patch)
treed2ee403350beb7e41e759aeb59cab3dd8a64311f
parentASoC: omap: n810: Correct the card level dapm_route (diff)
downloadlinux-dev-6f4a7594a6271b61f06382c0d4ec0525016edec6.tar.xz
linux-dev-6f4a7594a6271b61f06382c0d4ec0525016edec6.zip
ASoC: omap: n810: Correct the cpu_dai, platform and codec name
The non DT boot is no longer supported and when booting with DT the device names are different. Fix them up for now, but the n810.c should be updated to support probing via DT with proper bindings. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/omap/n810.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c
index e44bb5baac41..3a2c448a26dd 100644
--- a/sound/soc/omap/n810.c
+++ b/sound/soc/omap/n810.c
@@ -257,9 +257,9 @@ static const struct snd_kcontrol_new aic33_n810_controls[] = {
static struct snd_soc_dai_link n810_dai = {
.name = "TLV320AIC33",
.stream_name = "AIC33",
- .cpu_dai_name = "omap-mcbsp.2",
- .platform_name = "omap-mcbsp.2",
- .codec_name = "tlv320aic3x-codec.2-0018",
+ .cpu_dai_name = "48076000.mcbsp",
+ .platform_name = "48076000.mcbsp",
+ .codec_name = "tlv320aic3x-codec.1-0018",
.codec_dai_name = "tlv320aic3x-hifi",
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBM_CFM,