From patchwork Tue Sep 25 17:27:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 147520 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp992110lji; Tue, 25 Sep 2018 10:28:04 -0700 (PDT) X-Google-Smtp-Source: ACcGV61TcbckFi7Onv1HvQ6fFp0Qjeo1n5tvx4Q7AI7lZIoSRc9eNt69O5/Z/YdOc1ojlfnilu9c X-Received: by 2002:a05:6000:100f:: with SMTP id a15mr1420696wrx.271.1537896484675; Tue, 25 Sep 2018 10:28:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537896484; cv=none; d=google.com; s=arc-20160816; b=Rn4ESdzzzZz9BFxB8/9vrRiBjNmuVF7zgLbbaoZ3EWXi2qkh+p1g7RYaKAchhR/V00 2pdPvOnfoxMbzYowbgNo+3h7Gzr7OyG6W3xlBTRvHQ1caDaQB+qjYNPO82ex7eVaPJi9 gJixAk+h+Zhc26yP3AS+wo98obr1nau+EoO8QNArLfCDnJ9iOpDFAiCu0fAy5RrcusNG nIwOvTNAej2zOlvwuUE6Oteunadl11GvZ/vG+9bTYvCACRqp7tpF/kNF1H7OHf3iYQQb 2t/l6RW8YIrl2kG5g1VpmZ7NelFilns+TJ9D0l3qhxKaS2mfDynMKfe3D938MoyHyTtl JyQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to; bh=rspwP1wDM6F7EltvnKN4RHJnhyt5Ncvzgw5GaeQr0ws=; b=ED0E+lvD3mAyyJeizRSWKzvSnX/c4bvo/gXiOz4VsYRHjlKSzJNh5yrPu8Z5RWn7u8 81Qa6sJvYcW1dMr7uLTYQ6OvdgWCiH1Qj4ldj5QgPuyehhvgwh2uOBadM+wuM4sDDmnS dLQgn654RJin4Gvax8CI78yL8sZSpuvqicGD2sEyc6+41OF/lyApUpsjQWw9VHwJdVOQ Jr9w7DLv9kZXQEKwBacEC/5W9VRFeDI7rbw4aDs/ngvBXmjC944qzXh55jnJO6RH7tRz J3R//iwVrt/9wUGXvNQNjrjk4K5026bJKTEzd4pPIdgeEFS002+ZS3ywzbhueYAyhnFl baaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b="O/yoJwSz"; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id r7-v6si2571257wmr.164.2018.09.25.10.28.04; Tue, 25 Sep 2018 10:28:04 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b="O/yoJwSz"; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 4CFAC2678AF; Tue, 25 Sep 2018 19:28:03 +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 6A5902678B2; Tue, 25 Sep 2018 19:28:00 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id E3D58267892 for ; Tue, 25 Sep 2018 19:27:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=7xYm/cSV/DWPrMxjyqFypAcEPqJA2hgam0y+dgVRpDI=; b=O/yoJwSzM4j5 sq+P3lgev2xdPjTcE6E0LVCHppM0rxW1zrFZSREN7gpWYNojtudy3sYXf153FL63h11yANc/r/AwY 7YihDOwgL3htO78m2uwQdKFT/gE2WaTwUg8byphPj42RBWk3DCG4jowmSRR+tmx3tRmN9SRWzh+iy OS4/Q=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1g4r7r-0001Ho-Ah; Tue, 25 Sep 2018 17:27:55 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id E3AD8440078; Tue, 25 Sep 2018 18:27:54 +0100 (BST) From: Mark Brown To: Matt Flax In-Reply-To: <20180925064018.5484-1-flatmax@flatmax.org> Message-Id: <20180925172754.E3AD8440078@finisterre.ee.mobilebroadband> Date: Tue, 25 Sep 2018 18:27:54 +0100 (BST) Cc: alsa-devel@alsa-project.org, broonie@kernel.org, ckeepax@opensource.cirrus.com, brian.austin@cirrus.com, paul.handrigan@cirrus.com Subject: [alsa-devel] Applied "ASoC: cs4265: Add a MIC pre. route" 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: cs4265: Add a MIC pre. route has been applied to the asoc tree at https://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 b0ef5011b981ece1fde8063243a56d3038b87adb Mon Sep 17 00:00:00 2001 From: Matt Flax Date: Tue, 25 Sep 2018 16:40:18 +1000 Subject: [PATCH] ASoC: cs4265: Add a MIC pre. route The cs4265 driver is missing a microphone preamp enable. This patch enables/disables the microphone preamp when mic selection is made using the kcontrol. Signed-off-by: Matt Flax Reviewed-by: Charles Keepax Signed-off-by: Mark Brown --- sound/soc/codecs/cs4265.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.19.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/codecs/cs4265.c b/sound/soc/codecs/cs4265.c index d9eebf6af7a8..ab27d2b94d02 100644 --- a/sound/soc/codecs/cs4265.c +++ b/sound/soc/codecs/cs4265.c @@ -221,10 +221,11 @@ static const struct snd_soc_dapm_route cs4265_audio_map[] = { {"LINEOUTR", NULL, "DAC"}, {"SPDIFOUT", NULL, "SPDIF"}, + {"Pre-amp MIC", NULL, "MICL"}, + {"Pre-amp MIC", NULL, "MICR"}, + {"ADC Mux", "MIC", "Pre-amp MIC"}, {"ADC Mux", "LINEIN", "LINEINL"}, {"ADC Mux", "LINEIN", "LINEINR"}, - {"ADC Mux", "MIC", "MICL"}, - {"ADC Mux", "MIC", "MICR"}, {"ADC", NULL, "ADC Mux"}, {"DOUT", NULL, "ADC"}, {"DAI1 Capture", NULL, "DOUT"},