request for 4.14-stable: f53ee247ad54 ("ASoC: msm8916-wcd-digital: fix RX2 MIX1 and RX3 MIX1")

request for 4.14-stable: f53ee247ad54 ("ASoC: msm8916-wcd-digital: fix RX2 MIX1 and RX3 MIX1")

[Sudip Mukherjee]

[-- Attachment #1: Type: text/plain, Size: 127 bytes --]

Hi Greg,

This was not marked for stable but should be in stable. Please apply to
your queue of 4.14-stable.

--
Regards
Sudip

[-- Attachment #2: 0004-ASoC-msm8916-wcd-digital-fix-RX2-MIX1-and-RX3-MIX1.patch --]
[-- Type: text/x-diff, Size: 1957 bytes --]

>From 86216a98e19d508b6db0f84812c63407ac8a5b6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20T=C3=AAtu?=
 <jean-francois.tetu@savoirfairelinux.com>
Date: Fri, 22 Sep 2017 17:44:28 -0400
Subject: [PATCH] ASoC: msm8916-wcd-digital: fix RX2 MIX1 and RX3 MIX1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit f53ee247ad546183fc13739adafc5579b9f0ebc0 upstream

The kcontrol for the third input (rxN_mix1_inp3) of both RX2
and RX3 mixers are not using the correct control register. This simple
patch fixes this.

Signed-off-by: Jean-Fran�ois T�tu <jean-francois.tetu@savoirfairelinux.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
---
 sound/soc/codecs/msm8916-wcd-digital.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/msm8916-wcd-digital.c b/sound/soc/codecs/msm8916-wcd-digital.c
index 694db27b11fa..13354d6304a8 100644
--- a/sound/soc/codecs/msm8916-wcd-digital.c
+++ b/sound/soc/codecs/msm8916-wcd-digital.c
@@ -238,7 +238,7 @@ static const struct soc_enum rx_mix2_inp1_chain_enum = SOC_ENUM_SINGLE(
 static const struct soc_enum rx2_mix1_inp_enum[] = {
 	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX2_B1_CTL, 0, 6, rx_mix1_text),
 	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX2_B1_CTL, 3, 6, rx_mix1_text),
-	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX2_B1_CTL, 0, 6, rx_mix1_text),
+	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX2_B2_CTL, 0, 6, rx_mix1_text),
 };
 
 /* RX2 MIX2 */
@@ -249,7 +249,7 @@ static const struct soc_enum rx2_mix2_inp1_chain_enum = SOC_ENUM_SINGLE(
 static const struct soc_enum rx3_mix1_inp_enum[] = {
 	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX3_B1_CTL, 0, 6, rx_mix1_text),
 	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX3_B1_CTL, 3, 6, rx_mix1_text),
-	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX3_B1_CTL, 0, 6, rx_mix1_text),
+	SOC_ENUM_SINGLE(LPASS_CDC_CONN_RX3_B2_CTL, 0, 6, rx_mix1_text),
 };
 
 /* DEC */
-- 
2.11.0

Re: request for 4.14-stable: f53ee247ad54 ("ASoC: msm8916-wcd-digital: fix RX2 MIX1 and RX3 MIX1")

[Greg Kroah-Hartman]

On Tue, Aug 14, 2018 at 05:19:53PM +0100, Sudip Mukherjee wrote:
> Hi Greg,
> 
> This was not marked for stable but should be in stable. Please apply to
> your queue of 4.14-stable.

APplied, thanks.

greg k-h