summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHuang Chao <chao7.huang@samsung.com>2014-06-11 12:23:14 +0800
committerSylwester Nawrocki <s.nawrocki@samsung.com>2014-06-12 03:17:31 -0700
commitba8c32fcdace3854abd1b5269f2db9e83abd6c17 (patch)
tree447ecf6bd0c2a3ec01d725447122d30b88cda779
parent1fe759d421562270166f6541a32654ce09784d48 (diff)
downloadlinux-3.10-ba8c32fcdace3854abd1b5269f2db9e83abd6c17.tar.gz
linux-3.10-ba8c32fcdace3854abd1b5269f2db9e83abd6c17.tar.bz2
linux-3.10-ba8c32fcdace3854abd1b5269f2db9e83abd6c17.zip
ASoC: samsung: odroidx2/u3: Add secondary I2S bind DAI link
This patch enables the I2S0 secondary DAI and create a related audio playback device node, which will use the internal DMA (IDMA) platform driver for PCM data transfer. IDMA can support up to two channel sound for playback. Change-Id: If7a84437cf0dda6d018ced22f52e4e995b72f01c Signed-off-by: Huang Chao <chao7.huang@samsung.com>
-rw-r--r--sound/soc/samsung/odroidx2_max98090.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/sound/soc/samsung/odroidx2_max98090.c b/sound/soc/samsung/odroidx2_max98090.c
index 7d702640fcf..614c60fa1cd 100644
--- a/sound/soc/samsung/odroidx2_max98090.c
+++ b/sound/soc/samsung/odroidx2_max98090.c
@@ -69,6 +69,15 @@ static struct snd_soc_dai_link odroidx2_dai[] = {
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBM_CFM,
.ops = &odroidx2_ops,
+ }, {
+ .name = "MAX98090 SEC",
+ .stream_name = "MAX98090 PCM SEC",
+ .codec_dai_name = "HiFi",
+ .cpu_dai_name = "samsung-i2s-sec",
+ .platform_name = "samsung-i2s-sec",
+ .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
+ | SND_SOC_DAIFMT_CBM_CFM,
+ .ops = &odroidx2_ops,
},
};
@@ -109,6 +118,10 @@ static int odroidx2_audio_probe(struct platform_device *pdev)
odroidx2_dai[0].platform_of_node = odroidx2_dai[0].cpu_of_node;
+ /* Configure the secondary audio interface with the same codec dai */
+ odroidx2_dai[1].codec_name = NULL;
+ odroidx2_dai[1].codec_of_node = odroidx2_dai[0].codec_of_node;
+
return snd_soc_register_card(card);
}