commit 29e0262d697f43ddb8bbafc3ebfba8677094fd82
author Linux Build Service Account <lnxbuild@localhost> Fri Jul 19 12:29:01 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jul 19 12:29:01 2013 -0700
tree 74eacf86355677c12a6bfe9669425988ce445aca
parent 1582f5d69795b1d13a9647821309aafc630fb39d
parent eee157cff957aa42b4718f65219e5f4f6f8ba54e

Merge "ASoC: msm: Add FE DAI for QCHAT"

sound/soc/msm/msm-dai-fe.c

diff --git a/sound/soc/msm/msm-dai-fe.c b/sound/soc/msm/msm-dai-fe.c
index a0ed887..41fe8aa 100644
--- a/sound/soc/msm/msm-dai-fe.c
+++ b/sound/soc/msm/msm-dai-fe.c
@@ -741,6 +741,30 @@
 		.ops = &msm_fe_Multimedia_dai_ops,
 		.name = "MultiMedia9",
 	},
+	{
+		.playback = {
+			.stream_name = "QCHAT Playback",
+			.aif_name = "QCHAT_DL",
+			.rates = SNDRV_PCM_RATE_8000_48000,
+			.formats = SNDRV_PCM_FMTBIT_S16_LE,
+			.channels_min = 1,
+			.channels_max = 2,
+			.rate_min = 8000,
+			.rate_max = 48000,
+		},
+		.capture = {
+			.stream_name = "QCHAT Capture",
+			.aif_name = "QCHAT_UL",
+			.rates = SNDRV_PCM_RATE_8000_48000,
+			.formats = SNDRV_PCM_FMTBIT_S16_LE,
+			.channels_min = 1,
+			.channels_max = 2,
+			.rate_min = 8000,
+			.rate_max = 48000,
+		},
+		.ops = &msm_fe_dai_ops,
+		.name = "QCHAT",
+	},
 };
 
 static __devinit int msm_fe_dai_dev_probe(struct platform_device *pdev)