From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755014AbbCSMQx (ORCPT ); Thu, 19 Mar 2015 08:16:53 -0400 Received: from avasout02.plus.net ([212.159.14.17]:43982 "EHLO avasout02.plus.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751646AbbCSMQr (ORCPT ); Thu, 19 Mar 2015 08:16:47 -0400 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 Cc: lgirdwood@gmail.com, perex@perex.cz, corbet@lwn.net, alsa-devel@alsa-project.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, gordon@iqaudio.com, Howard Mitchell Subject: [PATCH 2/2] ASoC:pcm512x: Add 'Analogue' prefix to analogue volume controls 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> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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), -- 1.7.9.5