[RESEND PATCH] ASoC: codecs: msm8916-wcd-digital: fix RX2 MIX1 and RX3 MIX1

[RESEND PATCH] ASoC: codecs: msm8916-wcd-digital: fix RX2 MIX1 and RX3 MIX1

[Jean-François Têtu]

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>
---
 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 66df8f810f0d..a10a724eb448 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.14.2

Re: [RESEND PATCH] ASoC: codecs: msm8916-wcd-digital: fix RX2 MIX1 and RX3 MIX1

[Mark Brown]

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

On Fri, Oct 06, 2017 at 02:09:51PM -0400, Jean-François Têtu wrote:
> 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.

Please don't resubmit patches that have already been applied, you should
submit patches against current code in the tree you're expecting things
to be applied to.  If any updates are needed to a patch that's already
been applied you should submit incremental patches which make those
updates.  This avoids having to change published git commits which could
cause problems for people working against git.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 484 bytes --]

Re: [RESEND PATCH] ASoC: codecs: msm8916-wcd-digital: fix RX2 MIX1 and RX3 MIX1

[Jean-François Têtu]

Hello,

On Mon, Oct 09, 2017 4:31:46 AM, Mark Brown wrote:
>On Fri, Oct 06, 2017 at 02:09:51PM -0400, Jean-François Têtu wrote:
>> 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.
> 
> Please don't resubmit patches that have already been applied, you should
> submit patches against current code in the tree you're expecting things
> to be applied to.  If any updates are needed to a patch that's already
> been applied you should submit incremental patches which make those
> updates.  This avoids having to change published git commits which could
> cause problems for people working against git.

Oops, I'm sorry.  I did look in for-next and saw that the patch was there.
But, since I did not receive the "Applied" email or an ack from Srinivas, I
assumed that the patch was simply ignored and felt I should resend it.

--
Jean-François Têtu