summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorHaynes Mathew George <hgeorge@codeaurora.org>2013-09-17 14:36:48 -0700
committerRavi Kumar Alamanda <ralama@codeaurora.org>2013-11-29 22:00:56 -0800
commitb9886742ed90625b4321e0da8560e6ae2042e5a5 (patch)
treece590f6ded5bcc558c3a836aade63ee811938b68 /sound/soc
parent974bfef3688fd2847caa2c7471ebe2ddcf6cda79 (diff)
ASoC: msm: change to enable audio
Use the soc-compress platform driver for all compress FEs. Update the device tree to include the new platform driver. Change-Id: I08a3d77c0fc03d97fbf045cd67821ef4c56fd2bc Signed-off-by: Haynes Mathew George <hgeorge@codeaurora.org> Signed-off-by: Krishnankutty Kolathappilly <kkolat@codeaurora.org> Signed-off-by: Dhananjay Kumar <dhakumar@codeaurora.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/msm/msm8226.c2
-rw-r--r--sound/soc/msm/msm8974.c6
-rw-r--r--sound/soc/msm/msm8x10.c2
-rw-r--r--sound/soc/msm/qdsp6v2/Makefile2
4 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/msm/msm8226.c b/sound/soc/msm/msm8226.c
index 5ecb2bb361d7..d58dabc3d3cc 100644
--- a/sound/soc/msm/msm8226.c
+++ b/sound/soc/msm/msm8226.c
@@ -1189,7 +1189,7 @@ static struct snd_soc_dai_link msm8226_common_dai[] = {
.name = "MSM8226 Compr",
.stream_name = "COMPR",
.cpu_dai_name = "MultiMedia4",
- .platform_name = "msm-compr-dsp",
+ .platform_name = "msm-compress-dsp",
.dynamic = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST},
diff --git a/sound/soc/msm/msm8974.c b/sound/soc/msm/msm8974.c
index 6ad3f4b4d014..b6919b7d83f8 100644
--- a/sound/soc/msm/msm8974.c
+++ b/sound/soc/msm/msm8974.c
@@ -2127,7 +2127,7 @@ static struct snd_soc_dai_link msm8974_common_dai_links[] = {
.name = "MSM8974 Compr2",
.stream_name = "COMPR2",
.cpu_dai_name = "MultiMedia6",
- .platform_name = "msm-compr-dsp",
+ .platform_name = "msm-compress-dsp",
.dynamic = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST},
@@ -2142,7 +2142,7 @@ static struct snd_soc_dai_link msm8974_common_dai_links[] = {
.name = "MSM8974 Compr3",
.stream_name = "COMPR3",
.cpu_dai_name = "MultiMedia7",
- .platform_name = "msm-compr-dsp",
+ .platform_name = "msm-compress-dsp",
.dynamic = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST},
@@ -2157,7 +2157,7 @@ static struct snd_soc_dai_link msm8974_common_dai_links[] = {
.name = "MSM8974 Compr4",
.stream_name = "COMPR4",
.cpu_dai_name = "MultiMedia8",
- .platform_name = "msm-compr-dsp",
+ .platform_name = "msm-compress-dsp",
.dynamic = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST},
diff --git a/sound/soc/msm/msm8x10.c b/sound/soc/msm/msm8x10.c
index 0d99f1a930eb..0143a71fc258 100644
--- a/sound/soc/msm/msm8x10.c
+++ b/sound/soc/msm/msm8x10.c
@@ -772,7 +772,7 @@ static struct snd_soc_dai_link msm8x10_dai[] = {
.name = "MSM8X10 Compr",
.stream_name = "COMPR",
.cpu_dai_name = "MultiMedia4",
- .platform_name = "msm-compr-dsp",
+ .platform_name = "msm-compress-dsp",
.dynamic = 1,
.trigger = {SND_SOC_DPCM_TRIGGER_POST,
SND_SOC_DPCM_TRIGGER_POST},
diff --git a/sound/soc/msm/qdsp6v2/Makefile b/sound/soc/msm/qdsp6v2/Makefile
index fb7d7c790e50..3360d46f756e 100644
--- a/sound/soc/msm/qdsp6v2/Makefile
+++ b/sound/soc/msm/qdsp6v2/Makefile
@@ -1,5 +1,5 @@
snd-soc-qdsp6v2-objs += msm-dai-q6-v2.o msm-pcm-q6-v2.o msm-pcm-routing-v2.o \
- msm-compress-q6-v2.o msm-compr-q6-v2.o msm-multi-ch-pcm-q6-v2.o \
+ msm-compress-q6-v2.o msm-multi-ch-pcm-q6-v2.o \
msm-pcm-lpa-v2.o msm-pcm-afe-v2.o msm-pcm-voip-v2.o \
msm-pcm-voice-v2.o msm-dai-q6-hdmi-v2.o \
msm-lsm-client.o msm-pcm-host-voice-v2.o