From patchwork Wed Nov 29 18:59:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 120045 Delivered-To: patch@linaro.org Received: by 10.80.225.132 with SMTP id k4csp4724733edl; Wed, 29 Nov 2017 11:00:12 -0800 (PST) X-Google-Smtp-Source: AGs4zMbfbZm1jCOvDIMmkAbrfden75pBvSu3tBafrMQ45osIGvM7wnOPhYsUn0Qlkk9qNy8BkoYT X-Received: by 10.223.129.135 with SMTP id 7mr3513007wra.55.1511982012680; Wed, 29 Nov 2017 11:00:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511982012; cv=none; d=google.com; s=arc-20160816; b=aDmd6uhZddpqt9qcAl1PZDXsrSqku+Vu6HCG33ZSe8Y/b+N152QImqchaIB9oe5Mph s3cqO93pnkIkLGPMLim5YgQvpmWlxfSzJzcvn5kPURocu1vha1XMCjFuuec0qgcc5Ds+ /juVj+oBcBCI50MA0PWyRujTLekcp9PRrZZhbwi/vi5j245cL16uEck1WhF6gjtH6LSz o4y1gdRb3iCtNJSTHm6tFmrg+wr0kizvPjJigTAq0yN5nJQH6y2slltbI81i4M117SRH A5vKLBqlpMPgu/6WfjQPbs1rwoXpGSxANsjtWx5EDzhEbqFSlpKV6WkZhLvAKYquzXKL dV3Q== 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:arc-authentication-results; bh=tRnjHEQSTKGqKvHULaWNzIajUEgxbAgt8CoBjKykT8Q=; b=Q7WgPwR6hWlcTAkml1YL8SszZ0ftbALR1YiG1gbwvjgj8jbYAPoDSSB0bQrGY/DRvD 9VMfib8rEpnxeb4r0yv5fE/5WWzB/6SKnBngeG+P0v4d4dYiLV+0c1aH25ot2QkuzDB0 jbxsKYurPCU9ngGSNmTPi9Iy/E6QCfAuoExlelRr2FuoTOtbjwkpRFdmpzIcRO/dJoXw Rjn+HwmemQGTpQzAu1y+hO18n+fYq0U4MZbVD+csuKb9nZnQ44hxyyQKD87y49SQbLsL yiRIxcc5HjDPJJYXWjHt6OA7/Z0NQsMcJxN/7s5VULLUThlByUtDydwNAo5gsV3pzZeN Wpjw== 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=rsjMy6RZ; 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 Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id 30si1669689wrv.154.2017.11.29.11.00.11; Wed, 29 Nov 2017 11:00:12 -0800 (PST) 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=rsjMy6RZ; 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 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id CBDD426794E; Wed, 29 Nov 2017 20:00:01 +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 402C926793F; Wed, 29 Nov 2017 19:59:59 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, SPF_PASS, T_RP_MATCHES_RCVD 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 79F3C26791E for ; Wed, 29 Nov 2017 19:59:56 +0100 (CET) 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=oUa/VYRoQljnOzYJDJtx44tfxbJs06QwLeqyq62yVVg=; b=rsjMy6RZmo9K JB8bTJlRSM1wuXgSTB92/x4EUDD9Cf+Sa+TmpSmixwui97dSemIcXYd7TjBvxcTlx6Wfl4OC1OOvp bxnqp0259iwavs9QVa5CJVYvDPEl4A0Kty5lNrQCxWfUI8ZDxETOcVP7RYtPJFVHlaoWqPLbVQH2v T22/M=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1eK7aK-0001c1-Jv; Wed, 29 Nov 2017 18:59:52 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1eK7aK-0004ey-6D; Wed, 29 Nov 2017 18:59:52 +0000 From: Mark Brown To: Carlo Caione In-Reply-To: <20171121171546.5656-2-carlo@caione.org> Message-Id: Date: Wed, 29 Nov 2017 18:59:52 +0000 Cc: alsa-devel@alsa-project.org, lgirdwood@gmail.com, linux-kernel@vger.kernel.org, pierre-louis.bossart@linux.intel.com, broonie@kernel.org, linux@endlessm.com Subject: [alsa-devel] Applied "ASoC: intel: byt: Introduce new map for dual mics" 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: intel: byt: Introduce new map for dual mics 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 ea261bd02a671e2dd60380053dddffedab81644d Mon Sep 17 00:00:00 2001 From: Carlo Caione Date: Tue, 21 Nov 2017 17:15:45 +0000 Subject: [PATCH] ASoC: intel: byt: Introduce new map for dual mics The RT5651 codec has 3 analog inputs. Some laptops have two different internal analog microphones on the external case. Add a new custom quirk mapping the two internal mics on IN1P / IN2P, leaving the headset mic on IN3P. Signed-off-by: Carlo Caione Signed-off-by: Mark Brown --- sound/soc/intel/boards/bytcr_rt5651.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) -- 2.15.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index d955836c6870..e3d5e6ea707f 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -38,6 +38,7 @@ enum { BYT_RT5651_DMIC_MAP, BYT_RT5651_IN1_MAP, BYT_RT5651_IN2_MAP, + BYT_RT5651_IN1_IN2_MAP, }; #define BYT_RT5651_MAP(quirk) ((quirk) & GENMASK(7, 0)) @@ -171,6 +172,13 @@ static const struct snd_soc_dapm_route byt_rt5651_intmic_in2_map[] = { {"IN2P", NULL, "Internal Mic"}, }; +static const struct snd_soc_dapm_route byt_rt5651_intmic_in1_in2_map[] = { + {"Internal Mic", NULL, "micbias1"}, + {"IN1P", NULL, "Internal Mic"}, + {"IN2P", NULL, "Internal Mic"}, + {"IN3P", NULL, "Headset Mic"}, +}; + static const struct snd_kcontrol_new byt_rt5651_controls[] = { SOC_DAPM_PIN_SWITCH("Headphone"), SOC_DAPM_PIN_SWITCH("Headset Mic"), @@ -281,6 +289,10 @@ static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime) custom_map = byt_rt5651_intmic_in2_map; num_routes = ARRAY_SIZE(byt_rt5651_intmic_in2_map); break; + case BYT_RT5651_IN1_IN2_MAP: + custom_map = byt_rt5651_intmic_in1_in2_map; + num_routes = ARRAY_SIZE(byt_rt5651_intmic_in1_in2_map); + break; default: custom_map = byt_rt5651_intmic_dmic_map; num_routes = ARRAY_SIZE(byt_rt5651_intmic_dmic_map);