From patchwork Wed Jun 27 11:31:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 140317 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp743541ljj; Wed, 27 Jun 2018 04:31:37 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeFSRCqvi777viOzYcfWag5mwUXQuBLZqGIG+rDcMW+jMJRVE3X0PY+bw+vd8cCEr3QLLnm X-Received: by 2002:adf:f60a:: with SMTP id t10-v6mr4559460wrp.97.1530099097784; Wed, 27 Jun 2018 04:31:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530099097; cv=none; d=google.com; s=arc-20160816; b=WvK4KZs4nDVWvvNUOs6Z7SqpTJfy/CdmRqpO7ZDuB6phniTFDGKww4mhXBzCLN61Pe r2dPq3qbn1Qmt4blj+q4ToLLBrM4+thnrhKgwzzbjwvJesDF7EsDaE8VvR0CNpxghbQ0 TFnKOB1PywC6c+JO/nq4WK1pBX6DqqC3LoLnJm2zOfbJas0DQwU9EQOxEibIYZ3sJljD T+zI2wl0B6Pq4ktrtg2MKld4iwvybd4ktISFSv9GyWiY6qSUCESJjxchi76DeL0rNheb AROnPr6nzudmz4VoEv+tr1d7AaLSzBFXnHmQ/1pwnJaR7Zv8R59+0KpIoNNI22oJB5uO KPRQ== 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=LlNtetFkWgOSPIj9zcmyFGQu2K3lAod611elMfsn3EE=; b=btjSG/iSBv/YWLlAN6sVhMB9/nGyk5rC68ZuzEdB9/bR4d8H4vnpYjcX8dJVxiTnoI 0WzoWkQ7kJeYW8rsrUa0yJU4Gwl6NmJjheI8EZB1p7MO5ysRjaJ9cPqRipv+huH5TXMZ ylycEr3dqgKbKWLsCGcSC4TpuzDa7UUb8YW+5T8xcSWKJDDFIIJxqUNO0hidGepJXUiQ lzZwZI+UCtFcBlZgd0a+P+ZbA1B4Spz+m6oki9X0VfTKJmY2WiJw8SmiyQUyHc65Pv0C MLQhMuHrt7mPrZAiiW1f9T7guc3ManHbcHzD9tULaF3v6MNkERNoX7/S+vQ0RCFNeVor bVyA== 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=Iw0zKlZ7; 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 b10-v6si4539567wrf.58.2018.06.27.04.31.37; Wed, 27 Jun 2018 04:31:37 -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=Iw0zKlZ7; 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 82FB62679A0; Wed, 27 Jun 2018 13:31:36 +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 249BF267997; Wed, 27 Jun 2018 13:31:29 +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=1.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_WEB, 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 826F1267978 for ; Wed, 27 Jun 2018 13:31:27 +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=zRXw2CwsFu4+B9PbXgva6vPAXXr8jN3UXx4qG1OqjbI=; b=Iw0zKlZ7DN+N GACMJfoAgoVRAPucdnfGZnhp+bxCF1mMKNAiAZGcAgW9qR8YgOgli1vxLQ5ZMhqYFAv458BmOBDFN r2+vmnyyXha5cgmnaNYFF1/Px2oBB0H+MWiat+1BPgpYOGWsooanMQCpwTZ1pK3KFYPktUhPxBbd3 w2rVg=; Received: from 188.29.164.103.threembb.co.uk ([188.29.164.103] 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 1fY8fX-0002wN-4z; Wed, 27 Jun 2018 11:31:27 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 44E20440070; Wed, 27 Jun 2018 12:31:26 +0100 (BST) From: Mark Brown To: Hans de Goede In-Reply-To: <20180624140634.16835-7-hdegoede@redhat.com> Message-Id: <20180627113126.44E20440070@finisterre.ee.mobilebroadband> Date: Wed, 27 Jun 2018 12:31:26 +0100 (BST) Cc: Oder Chiou , alsa-devel@alsa-project.org, Pierre-Louis Bossart , Liam Girdwood , Mark Brown , Carlo Caione , Bard Liao Subject: [alsa-devel] Applied "ASoC: Intel: bytcr_rt5651: Fix DMIC map headsetmic mapping" 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: bytcr_rt5651: Fix DMIC map headsetmic mapping 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 37c7401e8c1f583d197c096152fc87a58f460277 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 24 Jun 2018 16:06:31 +0200 Subject: [PATCH] ASoC: Intel: bytcr_rt5651: Fix DMIC map headsetmic mapping The initial bytcr_rt5651 machine driver commit mapped IN2 as the headset mic. In retrospect this is not correct as all known boards have the headset mic on IN3. This commit fixes the original DMIC mapping to correctly have the headset mic on IN3. Signed-off-by: Hans de Goede Reviewed-by: Pierre-Louis Bossart Signed-off-by: Mark Brown --- sound/soc/intel/boards/bytcr_rt5651.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.17.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 bf2adb36f455..042334d9be32 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -236,9 +236,9 @@ 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"}, + {"IN3P", NULL, "Headset Mic"}, }; static const struct snd_soc_dapm_route byt_rt5651_intmic_in1_map[] = { @@ -684,7 +684,7 @@ struct acpi_chan_package { /* ACPICA seems to require 64 bit integers */ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) { const char * const intmic_name[] = { "dmic", "in1", "in12" }; - const char * const hsmic_name[] = { "in2", "in3", "in3" }; + const char * const hsmic_name[] = { "in3", "in3", "in3" }; struct byt_rt5651_private *priv; struct snd_soc_acpi_mach *mach; const char *i2c_name = NULL;