From patchwork Thu Mar 19 12:08:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Howard Mitchell X-Patchwork-Id: 6048581 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0F834BF90F for ; Thu, 19 Mar 2015 12:10:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4144D20532 for ; Thu, 19 Mar 2015 12:09:59 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 231A520527 for ; Thu, 19 Mar 2015 12:09:58 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 45EC0260581; Thu, 19 Mar 2015 13:09:57 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id A7E222604CA; Thu, 19 Mar 2015 13:09:17 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 7E085260496; Thu, 19 Mar 2015 13:09:16 +0100 (CET) Received: from avasout02.plus.net (avasout02.plus.net [212.159.14.17]) by alsa0.perex.cz (Postfix) with ESMTP id 3D78026046B for ; Thu, 19 Mar 2015 13:09:09 +0100 (CET) Received: from howard-VirtualBox.lan ([212.159.100.40]) by avasout02 with smtp id 5Q8X1q0060sHRKG01Q96qD; Thu, 19 Mar 2015 12:09:07 +0000 X-CM-Score: 0.00 X-CNFS-Analysis: v=2.1 cv=IsmQcdPg c=1 sm=1 tr=0 a=VGUxJGZ/H8UixBFj6Q9CRg==:117 a=VGUxJGZ/H8UixBFj6Q9CRg==:17 a=0Bzu9jTXAAAA:8 a=eIRpCU4CAAAA:8 a=ixmt6SZPQnldqEYNvRAA:9 a=S0Q7gxORTLTlLy8c:21 a=GCVXB4C2n5HKoRjj:21 X-AUTH: oscars+hm@:2500 From: Howard Mitchell To: broonie@kernel.org, tiwai@suse.de Date: Thu, 19 Mar 2015 12:08:30 +0000 Message-Id: <1426766910-27250-2-git-send-email-hm@hmbedded.co.uk> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1426766910-27250-1-git-send-email-hm@hmbedded.co.uk> References: <1426766910-27250-1-git-send-email-hm@hmbedded.co.uk> Cc: alsa-devel@alsa-project.org, corbet@lwn.net, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, lgirdwood@gmail.com, gordon@iqaudio.com, Howard Mitchell Subject: [alsa-devel] [PATCH 2/2] ASoC:pcm512x: Add 'Analogue' prefix to analogue volume controls X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP This is to ensure that 'alsactl restore' does not apply default initialisation as the chip reset defaults are preferred. Signed-off-by: Howard Mitchell --- sound/soc/codecs/pcm512x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c index 4b5f1fe..5301c4a 100644 --- a/sound/soc/codecs/pcm512x.c +++ b/sound/soc/codecs/pcm512x.c @@ -391,9 +391,9 @@ static const struct soc_enum pcm512x_veds = static const struct snd_kcontrol_new pcm512x_controls[] = { SOC_DOUBLE_R_TLV("Digital Playback Volume", PCM512x_DIGITAL_VOLUME_2, PCM512x_DIGITAL_VOLUME_3, 0, 255, 1, digital_tlv), -SOC_DOUBLE_TLV("Playback Volume", PCM512x_ANALOG_GAIN_CTRL, +SOC_DOUBLE_TLV("Analogue Playback Volume", PCM512x_ANALOG_GAIN_CTRL, PCM512x_LAGN_SHIFT, PCM512x_RAGN_SHIFT, 1, 1, analog_tlv), -SOC_DOUBLE_TLV("Playback Boost Volume", PCM512x_ANALOG_GAIN_BOOST, +SOC_DOUBLE_TLV("Analogue Playback Boost Volume", PCM512x_ANALOG_GAIN_BOOST, PCM512x_AGBL_SHIFT, PCM512x_AGBR_SHIFT, 1, 0, boost_tlv), SOC_DOUBLE("Digital Playback Switch", PCM512x_MUTE, PCM512x_RQML_SHIFT, PCM512x_RQMR_SHIFT, 1, 1),