Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp1084653ybn; Tue, 24 Sep 2019 14:30:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqwsM03BuivyphAbxMr4eezAJYKnPV/2Q1u7vegZqxd4V2a50u16TGxN+npzKWVzFkZnOfQ4 X-Received: by 2002:a5d:4491:: with SMTP id j17mr4576784wrq.257.1569360622991; Tue, 24 Sep 2019 14:30:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569360622; cv=none; d=google.com; s=arc-20160816; b=ANXVekKlCuRlRAMeklr4etIXNgwg9UXcbpSILTnlOE3HyR5RtXaNXvoLEi6fFp0Vcc FzZfYCtp3FX2QJg0BkpUpW8lYc4BZGWZI1oSnp9l3eX5hWk/gojlL+K/CnOL/1dxlUst MMpwTp8g5wKif5yjl1wTqzPelmFTiGGnGve5cvlcxbB8S2tRWpUvoW+ZG85I1LRS0x0z osMN7IuFuQ/0arcAfaMuhbbZtgGvwDgS94N8Cr50tfiU+FPFWqPZT5/zN6/xvarH8cF4 4yCMJ7PX5/7Cm5pwkVWrDDKgvf6UQD9otzWrbzMnhoIgGPz3aspKzEr2zBDRCCHlINiY OD+g== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cjsjKehZvPephEu0DiZdPezvZhwfffYRt0oOI3hbPsI=; b=0p/GFhIn4+IPc12PKElEWRGixPbxrOtpuONT+l5eNgc/myGVkMtrOYYyH1u5wf+sxc sQd2cJoriv3C+t2y1iRaAO0v492Yr0UjWlaQE2gav80bFcnPDpBkbuFEPTfrpB1sVDur 927CQGw9vK0lZ3dcGD/WDsLSVEUEA4ddsTZ12Est6xe+5sTDeywd7EVQP88qBq2TAuxT KxS2omisWixAj06Lj73AfH0A90WPdiROcaIBzLMzkcDIN5GgAXF8vPcrnnKJUBI1OKei J2+RIm210RPienmLsdqA32arG96lHtlvbQ92sykLWzDHcS+ZFGJcUsn1VV0uaQuF4C37 gj6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=NAZLCPwS; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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. [209.132.180.67]) by mx.google.com with ESMTP id f57si1918669ede.78.2019.09.24.14.29.59; Tue, 24 Sep 2019 14:30:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=NAZLCPwS; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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 S2438178AbfIVTd3 (ORCPT + 99 others); Sun, 22 Sep 2019 15:33:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:44068 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390929AbfIVSrh (ORCPT ); Sun, 22 Sep 2019 14:47:37 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6B60F2186A; Sun, 22 Sep 2019 18:47:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178057; bh=0NklFi5BNWNDgAY2+lWD5jgqXv5IH1+D0pno6Bub/tg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NAZLCPwSiE/Avk5kyA+jXv9GLCdt/p3RPGdP2EAfzMmgLw/251gCFqhADBG5lrOpv Uj0bc+B7XdJdMjnivr19t7qoMfBrMTwx6lH7X7GIzXtBF0xGs6EQqSAPXPrpYKeWhV PsxzgLyUlvxFz0hh0mM8DwgS7iB+SvmUNR/v343A= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Katsuhiro Suzuki , Daniel Drake , Mark Brown , Sasha Levin Subject: [PATCH AUTOSEL 5.3 133/203] ASoC: es8316: fix headphone mixer volume table Date: Sun, 22 Sep 2019 14:42:39 -0400 Message-Id: <20190922184350.30563-133-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Katsuhiro Suzuki [ Upstream commit f972d02fee2496024cfd6f59021c9d89d54922a6 ] This patch fix setting table of Headphone mixer volume. Current code uses 4 ... 7 values but these values are prohibited. Correct settings are the following: 0000 -12dB 0001 -10.5dB 0010 -9dB 0011 -7.5dB 0100 -6dB 1000 -4.5dB 1001 -3dB 1010 -1.5dB 1011 0dB Signed-off-by: Katsuhiro Suzuki Reviewed-by: Daniel Drake Link: https://lore.kernel.org/r/20190826153900.25969-1-katsuhiro@katsuster.net Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/es8316.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/es8316.c b/sound/soc/codecs/es8316.c index 6db002cc20582..96d04896193f2 100644 --- a/sound/soc/codecs/es8316.c +++ b/sound/soc/codecs/es8316.c @@ -51,7 +51,10 @@ static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(adc_vol_tlv, -9600, 50, 1); static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(alc_max_gain_tlv, -650, 150, 0); static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(alc_min_gain_tlv, -1200, 150, 0); static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(alc_target_tlv, -1650, 150, 0); -static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(hpmixer_gain_tlv, -1200, 150, 0); +static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(hpmixer_gain_tlv, + 0, 4, TLV_DB_SCALE_ITEM(-1200, 150, 0), + 8, 11, TLV_DB_SCALE_ITEM(-450, 150, 0), +); static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(adc_pga_gain_tlv, 0, 0, TLV_DB_SCALE_ITEM(-350, 0, 0), @@ -89,7 +92,7 @@ static const struct snd_kcontrol_new es8316_snd_controls[] = { SOC_DOUBLE_TLV("Headphone Playback Volume", ES8316_CPHP_ICAL_VOL, 4, 0, 3, 1, hpout_vol_tlv), SOC_DOUBLE_TLV("Headphone Mixer Volume", ES8316_HPMIX_VOL, - 0, 4, 7, 0, hpmixer_gain_tlv), + 0, 4, 11, 0, hpmixer_gain_tlv), SOC_ENUM("Playback Polarity", dacpol), SOC_DOUBLE_R_TLV("DAC Playback Volume", ES8316_DAC_VOLL, -- 2.20.1