From patchwork Tue Jun 16 15:33:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 188055 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp3764555ilo; Tue, 16 Jun 2020 08:43:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy6+y3gCsyL81akpGXJ4cgebPPggIM5L45GmzxFwlQjV/LNz8JAzPmuNKUQx3/su2egOMjG X-Received: by 2002:a17:906:19d3:: with SMTP id h19mr3288293ejd.106.1592322239602; Tue, 16 Jun 2020 08:43:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592322239; cv=none; d=google.com; s=arc-20160816; b=gWPtX11QXwlzxckqY6OX6hDb9Rx5BFLAfUP8+XNdWPX98aZi2tkaQKC0pceeD8wL/t aQ+0MZkC/cMkg2zO41EvWvJUyERxyP8mR3ZPd0S6+5BK7vCZX0MU+Wip15EamnUxU1Zm 41TEjt+Cd6PbfS7Yf1k8xdo+LAedkKibBb1AIvkzou8/8aNf+IGP/gy/8QR65dkYMV1S e4MmAexaf20ZtC6J+2mofGhrrJdjtL4OyuGIxtGUnUffx4gtdLLBNrtRZzCxa/WYz0jb YVnanMbkMHTHvyBu2LSc3nkf6iBPYRVXdPs1XG5M9uHt18dpKNQvCrPULMEDzXrA2agy gQrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=rAg3jTlnmsGsvEFq0nPUku/iceyELkQt0cYb+z7JxdY=; b=Q7dwot5vgD3IkuG9R+70U7KnyRGmSiCUs1H4PmnkBlPan044m+bY9dfkxJVD1ga0E2 RzhC58m/rbJRkxKftfxztWgKEix1AG8bTBSHw4XI3xaokgZbaIYlunESFQMs8QdZtzhk rii2AKYkx9FUn7Do9n9op6U6jyP8MYRqerpcEhGEMYxxmWrvIxEndA7dI++6nES+AjvM 0P+MG7aaOQLAJ5124CBFrOy+tU4VUTVsaCxAQsZxA9QKeL8V1i0atKzENtgxAc/BomMj MWpc1TJ0XP/ZvxdegMrmcCEK2HRruS2JNN42sY2Ic2w1KRslzGW7RxyJ8Khs47+eWHEz UPlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=IEHHCsCo; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 12si10934355edv.523.2020.06.16.08.43.59; Tue, 16 Jun 2020 08:43:59 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=IEHHCsCo; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731265AbgFPPnz (ORCPT + 15 others); Tue, 16 Jun 2020 11:43:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:33574 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730404AbgFPPny (ORCPT ); Tue, 16 Jun 2020 11:43:54 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4F718214F1; Tue, 16 Jun 2020 15:43:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592322233; bh=jxRBAJoYesLcQ4lUzvJzOYBx7xIDXeU3frH7E2O1cAk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IEHHCsCov4R/cUKD35UFhP/IDwmNzmFG1Ed9gx1dDwWSIQMkw+zQUh0mvcBipxyON 55iyYtsiJUQj9EFDGDEZr4e0E5LUkpjDFSLgfxKozf627xALoSmYl/WTd7z2foVPJN zEzx4Uw+iei3ojy7j8WE9G32cbpT5fU/BEOTMpkA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Murphy , Mark Brown Subject: [PATCH 5.7 051/163] ASoC: tlv320adcx140: Fix mic gain registers Date: Tue, 16 Jun 2020 17:33:45 +0200 Message-Id: <20200616153109.293589517@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200616153106.849127260@linuxfoundation.org> References: <20200616153106.849127260@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dan Murphy commit be8499c48f115b912f5747c420f66a5e2c31defe upstream. Fix the mic gain registers for channels 2-4. The incorret register was being set as it was touching the CH1 config registers. Fixes: 37bde5acf040 ("ASoC: tlv320adcx140: Add the tlv320adcx140 codec driver family") Signed-off-by: Dan Murphy Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20200427203608.7031-1-dmurphy@ti.com Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- sound/soc/codecs/tlv320adcx140.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/sound/soc/codecs/tlv320adcx140.c +++ b/sound/soc/codecs/tlv320adcx140.c @@ -511,11 +511,11 @@ static const struct snd_soc_dapm_route a static const struct snd_kcontrol_new adcx140_snd_controls[] = { SOC_SINGLE_TLV("Analog CH1 Mic Gain Volume", ADCX140_CH1_CFG1, 2, 42, 0, adc_tlv), - SOC_SINGLE_TLV("Analog CH2 Mic Gain Volume", ADCX140_CH1_CFG2, 2, 42, 0, + SOC_SINGLE_TLV("Analog CH2 Mic Gain Volume", ADCX140_CH2_CFG1, 2, 42, 0, adc_tlv), - SOC_SINGLE_TLV("Analog CH3 Mic Gain Volume", ADCX140_CH1_CFG3, 2, 42, 0, + SOC_SINGLE_TLV("Analog CH3 Mic Gain Volume", ADCX140_CH3_CFG1, 2, 42, 0, adc_tlv), - SOC_SINGLE_TLV("Analog CH4 Mic Gain Volume", ADCX140_CH1_CFG4, 2, 42, 0, + SOC_SINGLE_TLV("Analog CH4 Mic Gain Volume", ADCX140_CH4_CFG1, 2, 42, 0, adc_tlv), SOC_SINGLE_TLV("DRE Threshold", ADCX140_DRE_CFG0, 4, 9, 0,