Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp2916091pxb; Tue, 24 Aug 2021 10:31:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzIRsaDtV8WftE9mqHEjWCi2WJpy0pvPlRdZxqt3ZiEPrdlY9cd1p2d8/Iok/VJ1jBr/2aq X-Received: by 2002:a92:740f:: with SMTP id p15mr25064223ilc.181.1629826272756; Tue, 24 Aug 2021 10:31:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629826272; cv=none; d=google.com; s=arc-20160816; b=pxfzqgwwNn155ywXbCchSGxjR6IBwObHNh5AwIMi1aA+hNrcF5JlIsJdgxt5gQVx35 q9FPzSxz+wWFu6MJ9aBM7orlx5zyRPZ3ZB5JY9y45wFreqRbAq0ZfrDbvGJz0nVbnZ2O OnJBVwdooO111Ny/ch+bc5Vxf9g3QRd5+DgBDFnabcspBKcvPDuHC0OA+ksanJ7HwqdF xGWXlcmUkHvC28cBRgnQk6lYMUKngY2PM8VRSv2CALZ+A9ydXEcUl+8MHqAA0oNtxrhT +7fX7O4zgYzsB7Ov9YsH1p4uEFdwawNvhWUAYP76AOuslVlY7YHqJoERGixBZ8CkmK+T 0rYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=2CHsmnxSAiWoO4aksrxO00sh3t5+GDe+VEJsrkb2Zkg=; b=S60gJBtJeta8URzmtMF6/dDeDUgbPJcxn2uZ7jA0RKV3aRbWoX8C+R5FdjY5TaxbHb mlt738aAbI21aIzebfBvRhnWEQB3DnisGwD7eUcQR1bwNSAS3EClIIV7DKWFUI+FJNLI gTbVEiKEWzKXA+gL9FGfgqqImFz0kAIZMoMbYPJekpWK9OjqfY6MEjipgzKrJkb6CN5n mhPR6dU5vk1axCozsXPZ9vDUOOe9kR8mKoMnx6/SbUBM/1EZmsC0NJyqU+f+wxkNCazc n+CFXr8tTymBT8QJq/msDjv4tMFzRc31pH7o4zgkD9YVuDd+bQZA7cGZiO5lCRv96ual Bn2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="fJCmor3/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p133si16184168jap.27.2021.08.24.10.31.00; Tue, 24 Aug 2021 10:31:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=k20201202 header.b="fJCmor3/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241440AbhHXR3R (ORCPT + 99 others); Tue, 24 Aug 2021 13:29:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:35802 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240236AbhHXR1D (ORCPT ); Tue, 24 Aug 2021 13:27:03 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8EF4961B49; Tue, 24 Aug 2021 17:05:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1629824705; bh=M9fWKhUPS+ZVg1PXcpWyxYRWcVDywd5IoDbjGqunR88=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fJCmor3/6sii+k1GGDXIfDD1BE0gGFAc1zHXlmqY9xTVLU+9J+mxofMFp3h89CfS/ aD8yKqV4ieicnjj2rQG2AJTGxGMGYwTFpTxoWUC9Ff99gJe1Hb336Rw1R4w0cvR0kP 5/KIVOuuAmStolEdJbht7hDId/9Xj+XuIfNZCK1rv3yxdpmncsK/23s25uz6tFpjvF PXu1apP+NOousN6PwXF1ZgMOEpg1eW5IWrpuqRVHYHnRrobdllB8dHXlInKy2RuS9F HOdtxvanFrLN9mk0YXpuYG5pgFuLBwch2yqIpBaSGOraayFXkjcMu/rkddEV2aSLyr 42Yvv2sCp/Mug== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Richard Fitzgerald , Mark Brown , Sasha Levin Subject: [PATCH 4.14 06/64] ASoC: cs42l42: Correct definition of ADC Volume control Date: Tue, 24 Aug 2021 13:03:59 -0400 Message-Id: <20210824170457.710623-7-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210824170457.710623-1-sashal@kernel.org> References: <20210824170457.710623-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.245-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.14.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.14.245-rc1 X-KernelTest-Deadline: 2021-08-26T17:04+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Richard Fitzgerald [ Upstream commit ee86f680ff4c9b406d49d4e22ddf10805b8a2137 ] The ADC volume is a signed 8-bit number with range -97 to +12, with -97 being mute. Use a SOC_SINGLE_S8_TLV() to define this and fix the DECLARE_TLV_DB_SCALE() to have the correct start and mute flag. Fixes: 2c394ca79604 ("ASoC: Add support for CS42L42 codec") Signed-off-by: Richard Fitzgerald Link: https://lore.kernel.org/r/20210729170929.6589-1-rf@opensource.cirrus.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/cs42l42.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c index 39adb2fdd003..1d997b2df477 100644 --- a/sound/soc/codecs/cs42l42.c +++ b/sound/soc/codecs/cs42l42.c @@ -404,7 +404,7 @@ static const struct regmap_config cs42l42_regmap = { .cache_type = REGCACHE_RBTREE, }; -static DECLARE_TLV_DB_SCALE(adc_tlv, -9600, 100, false); +static DECLARE_TLV_DB_SCALE(adc_tlv, -9700, 100, true); static DECLARE_TLV_DB_SCALE(mixer_tlv, -6300, 100, true); static const char * const cs42l42_hpf_freq_text[] = { @@ -443,8 +443,7 @@ static const struct snd_kcontrol_new cs42l42_snd_controls[] = { CS42L42_ADC_INV_SHIFT, true, false), SOC_SINGLE("ADC Boost Switch", CS42L42_ADC_CTL, CS42L42_ADC_DIG_BOOST_SHIFT, true, false), - SOC_SINGLE_SX_TLV("ADC Volume", CS42L42_ADC_VOLUME, - CS42L42_ADC_VOL_SHIFT, 0xA0, 0x6C, adc_tlv), + SOC_SINGLE_S8_TLV("ADC Volume", CS42L42_ADC_VOLUME, -97, 12, adc_tlv), SOC_SINGLE("ADC WNF Switch", CS42L42_ADC_WNF_HPF_CTL, CS42L42_ADC_WNF_EN_SHIFT, true, false), SOC_SINGLE("ADC HPF Switch", CS42L42_ADC_WNF_HPF_CTL, -- 2.30.2