Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33c0beb5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: change to enable audio"

parents 3b0e419c b9886742

sound/soc/msm/msm8226.c

+1 −1
Original line number Diff line number Diff line
@@ -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},

sound/soc/msm/msm8974.c

+3 −3
Original line number Diff line number Diff line
@@ -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},

sound/soc/msm/msm8x10.c

+1 −1
Original line number Diff line number Diff line
@@ -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},

sound/soc/msm/qdsp6v2/Makefile

+1 −1
Original line number Diff line number Diff line 
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