From patchwork Sat Oct 21 10:13:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 116600 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp2612423qgn; Sat, 21 Oct 2017 03:13:39 -0700 (PDT) X-Google-Smtp-Source: ABhQp+Q6AU6GgViosI5Ft/Z7wuGeTF0EpZlEPEs2HQIPB1zS3O+q34mbfo/z6rXuOgG8KJt3VF0z X-Received: by 10.28.217.136 with SMTP id q130mr1076888wmg.89.1508580819091; Sat, 21 Oct 2017 03:13:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508580819; cv=none; d=google.com; s=arc-20160816; b=bBCcBvnsXrLnka45F1q048MQ5Orei+PwcWUCpkcxWYVR3icyje4iseHJUbTJnvmx7s CzDsZOhjBr8mULdyhT/9YhYWzTXo4PR8+lRsDB5wIwEwCknGdgtUX8H2pIzxg85O+djy URFLhoxelBcgGcIls/ZM7rtp60ejPI6Q0Bp0x3lLvUeuLq/6gQSKRiDNRhLRqKfSyvZL 5z6qQH6mZ4eWy3w2SDEsJKKpqhvaxjFI3oA+eEzhz3vRN2uT8ZyaBtU4nQ4haegCFcdB NXaeZXatRPgJewWSGECPvDWemu6wRLAdR57Q9Z74TAinvGd/lUxDPqNnIzmXpGrm8spM HIbA== 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=9AnDBviIYKXItDEv8ynm1ZwJB81ew2kbPVEBpUPfKDQ=; b=QiqjXp8R1tzFf5Erc2qefZR/ZYbubGySB6zQvf2ifJL+XDIeVpmUDNcjqnzNlKxOoo yDKdBCNvgN8L3fkRZdrAS9mNZZv5+3wrwzzDFYd4OYDfQN0nSFmp72aOtowlAtzeQROr a3V9g4gBpfDI78mDOUHfAt0V6lslZVWa1m3DOJ+Tix3GIb8EoenVzMcP9JfMpPs/Kjcp cvqJq57yydBnlXFBD4sUa1xgp/cpMZP08NdA8qNmyAyz3Ca2Nk/yzJRPdthFPq/H2Xrk JfXkoE6Xp2DpwlEIvWqFNPCL8SfT3sY8fGU/QubpEkVFtFm9No656cQDaD47tksOF/Ls OfOA== 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=ftBBXBId; 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 n11si2218281wrg.528.2017.10.21.03.13.38; Sat, 21 Oct 2017 03:13:39 -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=ftBBXBId; 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 921BD26774A; Sat, 21 Oct 2017 12:13:37 +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 D4AB126774B; Sat, 21 Oct 2017 12:13:35 +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.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RP_MATCHES_RCVD, SPF_PASS 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 4C0C1266DF5 for ; Sat, 21 Oct 2017 12:13:34 +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=x1pMZvOmmVUMmtqXEzfte+FrjYr6BisMFKYJMgx9sPk=; b=ftBBXBIdL7ia jfrOT8uyTLRj/ynMICRKx2GhjBwnAdTWPdFSAlNZau585XRvTXltP9JYCDOJg+TjDRa0NoB5O4UW2 jsrWFcEwDVGfrXtXQL8DEFEWd1ROz5rapF/cftDzFl7Ab+Sjkv/6ljbjcSkvaz+repocLRqoFtK2/ 35iBU=; Received: from 92.40.248.34.threembb.co.uk ([92.40.248.34] 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 1e5qma-0003sr-PS; Sat, 21 Oct 2017 10:13:33 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 4CA1D440057; Sat, 21 Oct 2017 11:13:31 +0100 (BST) From: Mark Brown To: Carlo Caione In-Reply-To: <20171018164957.2270-1-carlo@caione.org> Message-Id: <20171021101331.4CA1D440057@finisterre.ee.mobilebroadband> Date: Sat, 21 Oct 2017 11:13:31 +0100 (BST) 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 "SoC: intel: byt: Introduce new custom IN2 map" 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 SoC: intel: byt: Introduce new custom IN2 map 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 39712db878a499542651eb6c2f5ceec4eacc72d1 Mon Sep 17 00:00:00 2001 From: Carlo Caione Date: Wed, 18 Oct 2017 17:49:57 +0100 Subject: [PATCH] SoC: intel: byt: Introduce new custom IN2 map Introduce a new custom dapm routes map to quirk platforms with the internal mic connected to IN2P. Signed-off-by: Carlo Caione Reviewed-by: Pierre-Louis Bossart Signed-off-by: Mark Brown --- sound/soc/intel/boards/bytcr_rt5651.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) -- 2.14.1 _______________________________________________ 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 3076bfc0db5e..1dad5c98c9ef 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -37,6 +37,7 @@ enum { BYT_RT5651_DMIC_MAP, BYT_RT5651_IN1_MAP, + BYT_RT5651_IN2_MAP, }; #define BYT_RT5651_MAP(quirk) ((quirk) & GENMASK(7, 0)) @@ -58,6 +59,8 @@ static void log_quirks(struct device *dev) dev_info(dev, "quirk DMIC_MAP enabled"); if (BYT_RT5651_MAP(byt_rt5651_quirk) == BYT_RT5651_IN1_MAP) dev_info(dev, "quirk IN1_MAP enabled"); + if (BYT_RT5651_MAP(byt_rt5651_quirk) == BYT_RT5651_IN2_MAP) + dev_info(dev, "quirk IN2_MAP enabled"); if (byt_rt5651_quirk & BYT_RT5651_DMIC_EN) dev_info(dev, "quirk DMIC enabled"); if (byt_rt5651_quirk & BYT_RT5651_MCLK_EN) @@ -143,7 +146,6 @@ static const struct snd_soc_dapm_route byt_rt5651_audio_map[] = { {"ssp2 Rx", NULL, "AIF1 Capture"}, {"Headset Mic", NULL, "micbias1"}, /* lowercase for rt5651 */ - {"IN2P", NULL, "Headset Mic"}, {"Headphone", NULL, "HPOL"}, {"Headphone", NULL, "HPOR"}, {"Speaker", NULL, "LOUTL"}, @@ -151,15 +153,23 @@ static const struct snd_soc_dapm_route byt_rt5651_audio_map[] = { }; static const struct snd_soc_dapm_route byt_rt5651_intmic_dmic_map[] = { + {"IN2P", NULL, "Headset Mic"}, {"DMIC L1", NULL, "Internal Mic"}, {"DMIC R1", NULL, "Internal Mic"}, }; static const struct snd_soc_dapm_route byt_rt5651_intmic_in1_map[] = { {"Internal Mic", NULL, "micbias1"}, + {"IN2P", NULL, "Headset Mic"}, {"IN1P", NULL, "Internal Mic"}, }; +static const struct snd_soc_dapm_route byt_rt5651_intmic_in2_map[] = { + {"Internal Mic", NULL, "micbias1"}, + {"IN1P", NULL, "Headset Mic"}, + {"IN2P", NULL, "Internal Mic"}, +}; + static const struct snd_kcontrol_new byt_rt5651_controls[] = { SOC_DAPM_PIN_SWITCH("Headphone"), SOC_DAPM_PIN_SWITCH("Headset Mic"), @@ -246,6 +256,10 @@ static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime) custom_map = byt_rt5651_intmic_in1_map; num_routes = ARRAY_SIZE(byt_rt5651_intmic_in1_map); break; + case BYT_RT5651_IN2_MAP: + custom_map = byt_rt5651_intmic_in2_map; + num_routes = ARRAY_SIZE(byt_rt5651_intmic_in2_map); + break; default: custom_map = byt_rt5651_intmic_dmic_map; num_routes = ARRAY_SIZE(byt_rt5651_intmic_dmic_map);