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

Commit 315b08df 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: Fix Incall recording downlink failure"

parents 44d0aade 03d51584

sound/soc/msm/apq8084.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -3690,7 +3690,7 @@ static struct snd_soc_dai_link apq8084_common_be_dai_links[] = { 
		.codec_name     = "msm-stub-codec.1",

		.codec_dai_name = "msm-stub-tx",

		.no_pcm = 1,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.be_id = MSM_BACKEND_DAI_INCALL_RECORD_RX,

		.be_hw_params_fixup = msm_be_hw_params_fixup,

		.ignore_suspend = 1,

sound/soc/msm/msm8952-dai-links.c

+1 −1
Original line number Diff line number Diff line
@@ -1200,7 +1200,7 @@ static struct snd_soc_dai_link msm8952_common_be_dai[] = { 
		.codec_name     = "msm-stub-codec.1",

		.codec_dai_name = "msm-stub-tx",

		.no_pcm = 1,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.be_id = MSM_BACKEND_DAI_INCALL_RECORD_RX,

		.be_hw_params_fixup = msm_be_hw_params_fixup,

		.ignore_suspend = 1,

sound/soc/msm/msm8952.c

+1 −1
Original line number Diff line number Diff line
@@ -2346,7 +2346,7 @@ static struct snd_soc_dai_link msm8952_dai[] = { 
		.codec_name     = "msm-stub-codec.1",

		.codec_dai_name = "msm-stub-tx",

		.no_pcm = 1,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.be_id = MSM_BACKEND_DAI_INCALL_RECORD_RX,

		.be_hw_params_fixup = msm_be_hw_params_fixup,

		.ignore_suspend = 1,

sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.h

+2 −2
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ 
#define LPASS_BE_SEC_AUXPCM_TX "SEC_AUX_PCM_TX"

#define LPASS_BE_VOICE_PLAYBACK_TX "VOICE_PLAYBACK_TX"

#define LPASS_BE_VOICE2_PLAYBACK_TX "VOICE2_PLAYBACK_TX"

#define LPASS_BE_INCALL_RECORD_RX "INCALL_RECORD_TX"

#define LPASS_BE_INCALL_RECORD_TX "INCALL_RECORD_RX"

#define LPASS_BE_INCALL_RECORD_RX "INCALL_RECORD_RX"

#define LPASS_BE_INCALL_RECORD_TX "INCALL_RECORD_TX"

#define LPASS_BE_SEC_I2S_RX "SECONDARY_I2S_RX"

#define LPASS_BE_SPDIF_RX "SPDIF_RX"