From patchwork Wed Dec 23 00:08:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 105084 Delivered-To: patch@linaro.org Received: by 10.112.89.199 with SMTP id bq7csp3550864lbb; Tue, 22 Dec 2015 16:09:25 -0800 (PST) X-Received: by 10.194.79.201 with SMTP id l9mr33575363wjx.151.1450829365068; Tue, 22 Dec 2015 16:09:25 -0800 (PST) Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id z9si24461793wjw.234.2015.12.22.16.09.23; Tue, 22 Dec 2015 16:09:25 -0800 (PST) Received-SPF: neutral (google.com: 77.48.224.243 is neither permitted nor denied by best guess record for domain of alsa-devel-bounces@alsa-project.org) client-ip=77.48.224.243; Authentication-Results: mx.google.com; spf=neutral (google.com: 77.48.224.243 is neither permitted nor denied by best guess record for domain of alsa-devel-bounces@alsa-project.org) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 49484266042; Wed, 23 Dec 2015 01:09:21 +0100 (CET) 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 [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 0CE67265E28; Wed, 23 Dec 2015 01:09:10 +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 4F2D7265E2B; Wed, 23 Dec 2015 01:09:08 +0100 (CET) Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [106.187.55.193]) by alsa0.perex.cz (Postfix) with ESMTP id 0735B265D83 for ; Wed, 23 Dec 2015 01:09:01 +0100 (CET) Received: from cl-2057.lon-02.gb.sixxs.net ([2a01:348:6:808::2] helo=debutante) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1aBWzB-0000d5-VG; Wed, 23 Dec 2015 00:08:58 +0000 Received: from broonie by debutante with local (Exim 4.86) (envelope-from ) id 1aBWz9-0007JN-2X; Wed, 23 Dec 2015 00:08:55 +0000 From: Mark Brown To: Bard Liao , Mark Brown In-Reply-To: <1450663793-3351-1-git-send-email-bardliao@realtek.com> Message-Id: Date: Wed, 23 Dec 2015 00:08:55 +0000 X-SA-Exim-Connect-IP: 2a01:348:6:808::2 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 Subject: [alsa-devel] Applied "ASoC: rt5616: rename some alsa control names" to the asoc tree 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 The patch ASoC: rt5616: rename some alsa control names has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From e2133b64820df302a8e3d00c7531018470cd63a9 Mon Sep 17 00:00:00 2001 From: Bard Liao Date: Mon, 21 Dec 2015 10:09:53 +0800 Subject: [PATCH] ASoC: rt5616: rename some alsa control names Rename some alsa control name as what they should be. Signed-off-by: Bard Liao Signed-off-by: Mark Brown --- sound/soc/codecs/rt5616.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.6.2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/codecs/rt5616.c b/sound/soc/codecs/rt5616.c index 7bb56dddff8e..1c10d8ed39d2 100644 --- a/sound/soc/codecs/rt5616.c +++ b/sound/soc/codecs/rt5616.c @@ -323,9 +323,9 @@ static const struct snd_kcontrol_new rt5616_snd_controls[] = { RT5616_L_VOL_SFT, RT5616_R_VOL_SFT, 175, 0, dac_vol_tlv), /* IN1/IN2 Control */ - SOC_SINGLE_TLV("IN1 Boost", RT5616_IN1_IN2, + SOC_SINGLE_TLV("IN1 Boost Volume", RT5616_IN1_IN2, RT5616_BST_SFT1, 8, 0, bst_tlv), - SOC_SINGLE_TLV("IN2 Boost", RT5616_IN1_IN2, + SOC_SINGLE_TLV("IN2 Boost Volume", RT5616_IN1_IN2, RT5616_BST_SFT2, 8, 0, bst_tlv), /* INL/INR Volume Control */ SOC_DOUBLE_TLV("IN Capture Volume", RT5616_INL1_INR1_VOL, @@ -339,7 +339,7 @@ static const struct snd_kcontrol_new rt5616_snd_controls[] = { 127, 0, adc_vol_tlv), /* ADC Boost Volume Control */ - SOC_DOUBLE_TLV("ADC Boost Gain", RT5616_ADC_BST_VOL, + SOC_DOUBLE_TLV("ADC Boost Volume", RT5616_ADC_BST_VOL, RT5616_ADC_L_BST_SFT, RT5616_ADC_R_BST_SFT, 3, 0, adc_bst_tlv), };