From patchwork Fri Aug 8 15:05:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 35141 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oi0-f69.google.com (mail-oi0-f69.google.com [209.85.218.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A819B2118A for ; Fri, 8 Aug 2014 15:06:33 +0000 (UTC) Received: by mail-oi0-f69.google.com with SMTP id h136sf20162362oig.4 for ; Fri, 08 Aug 2014 08:06:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:cc:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=b5nf1Nid3DIngFdIynC0xyHwJkYsTj7Jvhz/vE46mNQ=; b=i1RG10KZX4nTTBkF5Oje0GI8YBHUjm1JbfknE0O6dgh1smdim88RyjH6uDYwjBy+si wTpjsrEh/0Dayv7yxrNtbzrPpkerSPLNhVlGU2AoBVDKphLjBrpcA9FpIlZvz2HdHW61 uCfDT94V0bRndpZq+ZSvQ6tLM8Nnr4pS5ypUgzt3nt5TtFqe2a8NmH4GX3YF0bM7lvFw CaqPRkpY8WKSK8EgitCL2mHtau967wS+V7cITPtbi10/aGIbDUvQHJRhhgQoe8x/pJgC 76EZrUw+jIEeV/kf7Mxr27O9N4BUp/SSl7Cjf40TXI7pln6WhfS1ZwlGAlW0p22x6HCI AOmA== X-Gm-Message-State: ALoCoQkruNAoDoj6XStkNhYPjjtsMw3tItiNQs86QGDEXVGcRQh/K6Ysq+mALTDmVHi8+Prd4Sx4 X-Received: by 10.182.125.68 with SMTP id mo4mr462409obb.49.1407510393271; Fri, 08 Aug 2014 08:06:33 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.109.117 with SMTP id k108ls534314qgf.3.gmail; Fri, 08 Aug 2014 08:06:33 -0700 (PDT) X-Received: by 10.221.59.194 with SMTP id wp2mr689741vcb.59.1407510393164; Fri, 08 Aug 2014 08:06:33 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id bl6si2964006vdd.61.2014.08.08.08.06.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 08 Aug 2014 08:06:33 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.176 as permitted sender) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id id10so8399606vcb.21 for ; Fri, 08 Aug 2014 08:06:33 -0700 (PDT) X-Received: by 10.52.94.108 with SMTP id db12mr7147737vdb.8.1407510393001; Fri, 08 Aug 2014 08:06:33 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp130819vcb; Fri, 8 Aug 2014 08:06:32 -0700 (PDT) X-Received: by 10.180.21.235 with SMTP id y11mr4648115wie.75.1407510391706; Fri, 08 Aug 2014 08:06:31 -0700 (PDT) Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id c5si3599920wie.66.2014.08.08.08.06.30 for ; Fri, 08 Aug 2014 08:06:31 -0700 (PDT) Received-SPF: none (google.com: alsa-devel-bounces@alsa-project.org does not designate permitted sender hosts) client-ip=77.48.224.243; Received: by alsa0.perex.cz (Postfix, from userid 1000) id D34CE265542; Fri, 8 Aug 2014 17:06:28 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=disabled version=3.2.4 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 5E68F2650E1; Fri, 8 Aug 2014 17:06:18 +0200 (CEST) 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 8E7F12650FA; Fri, 8 Aug 2014 17:06:16 +0200 (CEST) Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [106.187.55.193]) by alsa0.perex.cz (Postfix) with ESMTP id 192E3265056 for ; Fri, 8 Aug 2014 17:06:08 +0200 (CEST) Received: from cpc11-sgyl31-2-0-cust672.sgyl.cable.virginm.net ([94.175.94.161] helo=debutante) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1XFlk4-0002Io-Lo; Fri, 08 Aug 2014 15:06:05 +0000 Received: from broonie by debutante with local (Exim 4.83) (envelope-from ) id 1XFlk1-0006nz-Rv; Fri, 08 Aug 2014 16:06:01 +0100 From: Mark Brown To: Liam Girdwood Date: Fri, 8 Aug 2014 16:05:52 +0100 Message-Id: <1407510352-26125-1-git-send-email-broonie@kernel.org> X-Mailer: git-send-email 2.0.1 X-SA-Exim-Connect-IP: 94.175.94.161 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on mezzanine.sirena.org.uk) Cc: alsa-devel@alsa-project.org, linaro-kernel@lists.linaro.org, Mark Brown Subject: [alsa-devel] [PATCH] ASoC: pcm512x: Correct Digital Playback control names X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: 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-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: broonie@kernel.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.220.176 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Mark Brown The source type should come before the direction specifier according to ControlNames.txt. Signed-off-by: Mark Brown --- 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 163ec3855fd4..0c8aefab404c 100644 --- a/sound/soc/codecs/pcm512x.c +++ b/sound/soc/codecs/pcm512x.c @@ -259,13 +259,13 @@ static const struct soc_enum pcm512x_veds = pcm512x_ramp_step_text); static const struct snd_kcontrol_new pcm512x_controls[] = { -SOC_DOUBLE_R_TLV("Playback Digital Volume", PCM512x_DIGITAL_VOLUME_2, +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, PCM512x_LAGN_SHIFT, PCM512x_RAGN_SHIFT, 1, 1, analog_tlv), SOC_DOUBLE_TLV("Playback Boost Volume", PCM512x_ANALOG_GAIN_BOOST, PCM512x_AGBL_SHIFT, PCM512x_AGBR_SHIFT, 1, 0, boost_tlv), -SOC_DOUBLE("Playback Digital Switch", PCM512x_MUTE, PCM512x_RQML_SHIFT, +SOC_DOUBLE("Digital Playback Switch", PCM512x_MUTE, PCM512x_RQML_SHIFT, PCM512x_RQMR_SHIFT, 1, 1), SOC_SINGLE("Deemphasis Switch", PCM512x_DSP, PCM512x_DEMP_SHIFT, 1, 1),