From patchwork Fri Oct 24 06:00:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Hsu X-Patchwork-Id: 39405 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D6C5E20341 for ; Fri, 24 Oct 2014 06:01:07 +0000 (UTC) Received: by mail-lb0-f198.google.com with SMTP id 10sf1393605lbg.1 for ; Thu, 23 Oct 2014 23:01:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=4k9qgvFbJa8VAblqfa5Ptkve37xVXUuIfEDeSHhgqFY=; b=fDGLVvU0cdrzI1lVdYpcztdKU8NWeTuZFEZ4+4KbZgjDcCY9G9bdqjk4hk2K7jHajK 8SkV7+fher+/H2Mc3+rnc+oxAV/elBG5mAgghT5A+nHD2CNSd8jr0cQTK4pV8KNm8+sD Vcq6sDh9NPr/4aL5WrFZYx48fVnG9NINL+6251UOub16svfO9Rn+DDzyLaAc5UQazeq9 or/8yxGITmq9zY21IgnpRgcybaVMNTUi/O8xaHPaKtb3gAMV3TSTOaX+PwCEOdekiTLN XhpSq2jTYM2xisgOj0PqYOx1yUyeh2pwL5zf9ldi9ou1ZG/8cNA5WwCuoD++ALLBY4VE vsDQ== X-Gm-Message-State: ALoCoQmdEfzi/jMnFTFIlsVyHZomP64eLvG1sL6u2dNB790t2dhLXJkNGNnxl+LCBNI96YlIUUsu X-Received: by 10.112.137.202 with SMTP id qk10mr180888lbb.11.1414130466717; Thu, 23 Oct 2014 23:01:06 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.67 with SMTP id o3ls409396laj.22.gmail; Thu, 23 Oct 2014 23:01:06 -0700 (PDT) X-Received: by 10.112.219.3 with SMTP id pk3mr2176162lbc.18.1414130466579; Thu, 23 Oct 2014 23:01:06 -0700 (PDT) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com. [209.85.217.182]) by mx.google.com with ESMTPS id jo3si5373564lab.125.2014.10.23.23.01.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 23 Oct 2014 23:01:06 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) client-ip=209.85.217.182; Received: by mail-lb0-f182.google.com with SMTP id f15so638949lbj.27 for ; Thu, 23 Oct 2014 23:01:06 -0700 (PDT) X-Received: by 10.153.8.164 with SMTP id dl4mr2051203lad.29.1414130466311; Thu, 23 Oct 2014 23:01:06 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.84.229 with SMTP id c5csp374980lbz; Thu, 23 Oct 2014 23:01:05 -0700 (PDT) X-Received: by 10.68.164.65 with SMTP id yo1mr2489315pbb.126.1414130464537; Thu, 23 Oct 2014 23:01:04 -0700 (PDT) Received: from Kraken ([124.219.7.128]) by mx.google.com with ESMTP id di2si3294261pbb.224.2014.10.23.23.01.02 for ; Thu, 23 Oct 2014 23:01:04 -0700 (PDT) Received-SPF: temperror (google.com: error in processing during lookup of xavier@kraken: DNS timeout) client-ip=124.219.7.128; Received: by Kraken (Postfix, from userid 1011) id 043BC6A27A7; Fri, 24 Oct 2014 14:00:53 +0800 (CST) From: Xavier Hsu To: alsa-devel@alsa-project.org, patches@opensource.wolfsonmicro.com, patches@linaro.org Cc: lars@metafoo.de, ckeepax@opensource.wolfsonmicro.com, Xavier Hsu , Andy Green Subject: [PATCHv5 4/9] ASOC: wm8971: add TLV information Date: Fri, 24 Oct 2014 14:00:30 +0800 Message-Id: <1414130435-14183-4-git-send-email-xavier.hsu@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1414130435-14183-1-git-send-email-xavier.hsu@linaro.org> References: <1414130435-14183-1-git-send-email-xavier.hsu@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: xavier.hsu@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , We add TLV information because all volume controls should have TLV information. Signed-off-by: Xavier Hsu Signed-off-by: Andy Green --- sound/soc/codecs/wm8971.c | 57 +++++++++++++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 18 deletions(-) diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c index b8b6be9..4572446 100755 --- a/sound/soc/codecs/wm8971.c +++ b/sound/soc/codecs/wm8971.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "wm8971.h" @@ -207,8 +208,19 @@ static const SOC_ENUM_SINGLE_DECL(capture_polarity, WM8971_ADCDAC, 5, wm8971_adcpol); static const SOC_ENUM_SINGLE_DECL(monomux, WM8971_ADCIN, 6, wm8971_mono_mux); +static const DECLARE_TLV_DB_SCALE(in_vol, -1725, 75, 0); +static const DECLARE_TLV_DB_SCALE(out_vol, -6700, 91, 0); +static const DECLARE_TLV_DB_SCALE(attenuate_6db, -600, 600, 0); +static const DECLARE_TLV_DB_SCALE(dac_vol, -12700, 50, 0); +static const DECLARE_TLV_DB_SCALE(tone_vol, -600, 150, 0); +static const DECLARE_TLV_DB_SCALE(alc_tar_vol, -2850, 150, 0); +static const DECLARE_TLV_DB_SCALE(alc_max_vol, -1200, 600, 0); +static const DECLARE_TLV_DB_SCALE(adc_vol, -9700, 50, 0); +static const DECLARE_TLV_DB_SCALE(bypass_out_vol, -1500, 300, 0); + static const struct snd_kcontrol_new wm8971_snd_controls[] = { - SOC_DOUBLE_R("Capture Volume", WM8971_LINVOL, WM8971_RINVOL, 0, 63, 0), + SOC_DOUBLE_R_TLV("Capture Volume", WM8971_LINVOL, WM8971_RINVOL, + 0, 63, 0, in_vol), SOC_DOUBLE_R("Capture ZC Switch", WM8971_LINVOL, WM8971_RINVOL, 6, 1, 0), SOC_DOUBLE_R("Capture Switch", WM8971_LINVOL, WM8971_RINVOL, 7, 1, 1), @@ -219,31 +231,35 @@ static const struct snd_kcontrol_new wm8971_snd_controls[] = { WM8971_ROUT2V, 7, 1, 0), SOC_SINGLE("Mono Playback ZC Switch", WM8971_MOUTV, 7, 1, 0), - SOC_DOUBLE_R("PCM Volume", WM8971_LDAC, WM8971_RDAC, 0, 255, 0), + SOC_DOUBLE_R_TLV("PCM Volume", WM8971_LDAC, WM8971_RDAC, + 0, 255, 0, dac_vol), - SOC_DOUBLE_R("Bypass Left Playback Volume", WM8971_LOUTM1, - WM8971_LOUTM2, 4, 7, 1), - SOC_DOUBLE_R("Bypass Right Playback Volume", WM8971_ROUTM1, - WM8971_ROUTM2, 4, 7, 1), - SOC_DOUBLE_R("Bypass Mono Playback Volume", WM8971_MOUTM1, - WM8971_MOUTM2, 4, 7, 1), + SOC_DOUBLE_R_TLV("Bypass Left Playback Volume", WM8971_LOUTM1, + WM8971_LOUTM2, 4, 7, 1, bypass_out_vol), + SOC_DOUBLE_R_TLV("Bypass Right Playback Volume", WM8971_ROUTM1, + WM8971_ROUTM2, 4, 7, 1, bypass_out_vol), + SOC_DOUBLE_R_TLV("Bypass Mono Playback Volume", WM8971_MOUTM1, + WM8971_MOUTM2, 4, 7, 1, bypass_out_vol), - SOC_DOUBLE_R("Headphone Playback Volume", WM8971_LOUT1V, - WM8971_ROUT1V, 0, 127, 0), - SOC_DOUBLE_R("Speaker Playback Volume", WM8971_LOUT2V, - WM8971_ROUT2V, 0, 127, 0), + SOC_DOUBLE_R_TLV("Headphone Playback Volume", WM8971_LOUT1V, + WM8971_ROUT1V, 0, 127, 0, out_vol), + SOC_DOUBLE_R_TLV("Speaker Playback Volume", WM8971_LOUT2V, + WM8971_ROUT2V, 0, 127, 0, out_vol), + SOC_SINGLE_TLV("Mono Playback Volume", WM8971_MOUTV, + 0, 127, 0, out_vol), SOC_ENUM("Bass Boost", bass_boost), SOC_ENUM("Bass Filter", bass_filter), - SOC_SINGLE("Bass Volume", WM8971_BASS, 0, 7, 1), + SOC_SINGLE_TLV("Bass Volume", WM8971_BASS, 0, 15, 1, tone_vol), - SOC_SINGLE("Treble Volume", WM8971_TREBLE, 0, 7, 0), + SOC_SINGLE_TLV("Treble Volume", WM8971_TREBLE, 0, 15, 0, tone_vol), SOC_ENUM("Treble Cut-off", treble_cutoff), SOC_SINGLE("Capture Filter Switch", WM8971_ADCDAC, 0, 1, 1), - SOC_SINGLE("ALC Target Volume", WM8971_ALC1, 0, 7, 0), - SOC_SINGLE("ALC Max Volume", WM8971_ALC1, 4, 7, 0), + SOC_SINGLE_TLV("ALC Target Volume", WM8971_ALC1, + 0, 15, 0, alc_tar_vol), + SOC_SINGLE_TLV("ALC Max Volume", WM8971_ALC1, 4, 7, 0, alc_max_vol), SOC_SINGLE("ALC Capture Target Volume", WM8971_ALC1, 0, 7, 0), SOC_SINGLE("ALC Capture Max Volume", WM8971_ALC1, 4, 7, 0), @@ -256,8 +272,10 @@ static const struct snd_kcontrol_new wm8971_snd_controls[] = { SOC_ENUM("ALC Capture NG Type", alc_capture_ngtype), SOC_SINGLE("ALC Capture NG Switch", WM8971_NGATE, 0, 1, 0), - SOC_SINGLE("Capture 6dB Attenuate", WM8971_ADCDAC, 8, 1, 0), - SOC_SINGLE("Playback 6dB Attenuate", WM8971_ADCDAC, 7, 1, 0), + SOC_SINGLE_TLV("Capture 6dB Attenuate", WM8971_ADCDAC, + 8, 1, 0, attenuate_6db), + SOC_SINGLE_TLV("Playback 6dB Attenuate", WM8971_ADCDAC, + 7, 1, 0, attenuate_6db), SOC_SINGLE_BOOL_EXT("Playback De-emphasis Switch", 0, wm8971_get_deemph, wm8971_put_deemph), @@ -265,6 +283,9 @@ static const struct snd_kcontrol_new wm8971_snd_controls[] = { SOC_ENUM("Playback Phase", dac_phase_inv), SOC_DOUBLE_R("Mic Boost", WM8971_LADCIN, WM8971_RADCIN, 4, 3, 0), + + SOC_DOUBLE_R_TLV("ADC Volume", WM8971_LADC, WM8971_RADC, + 0, 255, 0, adc_vol), }; /*