From patchwork Wed Jun 27 11:31:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 140318 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp743852ljj; Wed, 27 Jun 2018 04:31:50 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfpXqcO24Sp/+d7k+/Q+gvw3TwKK5ObAcXJYI38gUyxBAiW2EawkGPy/Fusg4xU0A+brN5b X-Received: by 2002:a1c:59c1:: with SMTP id n184-v6mr4924717wmb.125.1530099110386; Wed, 27 Jun 2018 04:31:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530099110; cv=none; d=google.com; s=arc-20160816; b=ebaNUnNEv9XlL3XA5dDr8KYTQI/RZXswJ9QN4O7m1c5BDAsj0roBimwobUmGOvidRd TeCbPFtw96JBrGcDo0ivAJfrf40ULbpKjE5ykSrV0ypMdna4C6e1m6VDosgWMIdDMpgl b7w+oEU7Hih5kMqyhjeIj28SFlyelgoTP/HazNdSJ1ImF7xOGHA1yTMjpHXg2mrQ9K4M 0QXKghCpk8squBoPjzaN2s4EiGkQ8Focmf8CugaxyGwXCg7QO3ELA0RRRQtxo4jNlNqw AXY0pBzeVHwmS8merBUwx8Z7pu5PLe/23Rpk1omZ7mqANPczOrpjzMKyJO4wp2N12XvS rOLA== 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=Kkf8FkF/KrRmndKu0nCkSsTmlc8upT3+gLi8umr8Kdo=; b=06cN0bD8i5NEQ4KGmqRRcWDd2oVchvUrw4pa9llWs6VElGJNjdYnFw/JnevKeOZT00 BH/Ql3NBodrPL9GEvd3ad1IWykvmqbJIznyazDSvRQ5GFaXkEC7xRxEdoT2Y5dKLSuJS oqxxo49CsD7THfYDg/8fjOCEEMJjlK/OVVXGBk8i4RFW3ZWw/1i9TSGDNNGQACL6xTII xt3b8Dw0WjZbsugoATsu3lz+C+Jor66IrGmJbAxvjx900TcD+TF8fYaa2yUPb9l4+uSO 0zNudk0J86ndaHYsKh8oX4H2HPRDBUuIYCDx75X7GCfdjFk8X6JKujXKuqFC8E9UPTV1 I4dg== 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=UQ0qLDez; 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 j3-v6si3595316wrr.446.2018.06.27.04.31.50; Wed, 27 Jun 2018 04:31:50 -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=UQ0qLDez; 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 42C14267610; Wed, 27 Jun 2018 13:31:49 +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 006302679BE; Wed, 27 Jun 2018 13:31:46 +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 3519D2679A8 for ; Wed, 27 Jun 2018 13:31:44 +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=ECvXX/PHmu3K8hh0Bzqmm8m9JQlIpcKpIL0Pvf6Up9M=; b=UQ0qLDezsgt/ fbbXLLW3DBZJBBrTmwx99j4aGa7Y932CPHcYqrk/hzfqYkyeR5bj60mkQVcyZUuDxre6NOPgZQcid Nl2P537SCyay87yfzJKMMqlBWD1M8DVuW21w+iIrSmPiMk9DarXd9CxZykWzZU+6/eoUz2awird4U 9qMTA=; 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 1fY8fn-0002wY-IV; Wed, 27 Jun 2018 11:31:43 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id A0083440070; Wed, 27 Jun 2018 12:31:42 +0100 (BST) From: Mark Brown To: Hans de Goede In-Reply-To: <20180624140634.16835-6-hdegoede@redhat.com> Message-Id: <20180627113142.A0083440070@finisterre.ee.mobilebroadband> Date: Wed, 27 Jun 2018 12:31:42 +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 IN1 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 IN1 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 de23147983013591bc4d6812ce441f351dec6b9d Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 24 Jun 2018 16:06:30 +0200 Subject: [PATCH] ASoC: Intel: bytcr_rt5651: Fix IN1 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. To workaround this special IN?_HS_IN3 mappings were added. This commit fixes the original IN1 mapping to correctly have the headset mic on IN3, moves all users of the IN1_HS_IN3 mapping over to the fixed IN1_MAP and drops the now no longer needed IN1_HS_IN3 mapping. Signed-off-by: Hans de Goede Reviewed-by: Pierre-Louis Bossart Signed-off-by: Mark Brown --- sound/soc/intel/boards/bytcr_rt5651.c | 29 +++++++-------------------- 1 file changed, 7 insertions(+), 22 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 b8ca7137d8b2..bf2adb36f455 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -41,7 +41,6 @@ enum { BYT_RT5651_DMIC_MAP, BYT_RT5651_IN1_MAP, BYT_RT5651_IN1_IN2_MAP, - BYT_RT5651_IN1_HS_IN3_MAP, }; enum { @@ -90,7 +89,7 @@ struct byt_rt5651_private { /* Default: jack-detect on JD1_1, internal mic on in1, headsetmic on in3 */ static unsigned long byt_rt5651_quirk = BYT_RT5651_DEFAULT_QUIRKS | - BYT_RT5651_IN1_HS_IN3_MAP; + BYT_RT5651_IN1_MAP; static void log_quirks(struct device *dev) { @@ -100,8 +99,6 @@ static void log_quirks(struct device *dev) dev_info(dev, "quirk IN1_MAP enabled"); if (BYT_RT5651_MAP(byt_rt5651_quirk) == BYT_RT5651_IN1_IN2_MAP) dev_info(dev, "quirk IN1_IN2_MAP enabled"); - if (BYT_RT5651_MAP(byt_rt5651_quirk) == BYT_RT5651_IN1_HS_IN3_MAP) - dev_info(dev, "quirk IN1_HS_IN3_MAP enabled"); if (BYT_RT5651_JDSRC(byt_rt5651_quirk)) { dev_info(dev, "quirk realtek,jack-detect-source %ld\n", BYT_RT5651_JDSRC(byt_rt5651_quirk)); @@ -247,7 +244,7 @@ static const struct snd_soc_dapm_route byt_rt5651_intmic_dmic_map[] = { static const struct snd_soc_dapm_route byt_rt5651_intmic_in1_map[] = { {"Internal Mic", NULL, "micbias1"}, {"IN1P", NULL, "Internal Mic"}, - {"IN2P", NULL, "Headset Mic"}, + {"IN3P", NULL, "Headset Mic"}, }; static const struct snd_soc_dapm_route byt_rt5651_intmic_in1_in2_map[] = { @@ -257,12 +254,6 @@ static const struct snd_soc_dapm_route byt_rt5651_intmic_in1_in2_map[] = { {"IN3P", NULL, "Headset Mic"}, }; -static const struct snd_soc_dapm_route byt_rt5651_intmic_in1_hs_in3_map[] = { - {"Internal Mic", NULL, "micbias1"}, - {"IN1P", NULL, "Internal Mic"}, - {"IN3P", NULL, "Headset Mic"}, -}; - static const struct snd_soc_dapm_route byt_rt5651_ssp0_aif1_map[] = { {"ssp0 Tx", NULL, "modem_out"}, {"modem_in", NULL, "ssp0 Rx"}, @@ -348,7 +339,7 @@ static const struct dmi_system_id byt_rt5651_quirk_table[] = { DMI_MATCH(DMI_SYS_VENDOR, "Circuitco"), DMI_MATCH(DMI_PRODUCT_NAME, "Minnowboard Max B3 PLATFORM"), }, - .driver_data = (void *)(BYT_RT5651_IN1_HS_IN3_MAP), + .driver_data = (void *)(BYT_RT5651_IN1_MAP), }, { .callback = byt_rt5651_quirk_cb, @@ -357,7 +348,7 @@ static const struct dmi_system_id byt_rt5651_quirk_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Minnowboard Turbot"), }, .driver_data = (void *)(BYT_RT5651_MCLK_EN | - BYT_RT5651_IN1_HS_IN3_MAP), + BYT_RT5651_IN1_MAP), }, { .callback = byt_rt5651_quirk_cb, @@ -376,7 +367,7 @@ static const struct dmi_system_id byt_rt5651_quirk_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "D2D3_Vi8A1"), }, .driver_data = (void *)(BYT_RT5651_DEFAULT_QUIRKS | - BYT_RT5651_IN1_HS_IN3_MAP), + BYT_RT5651_IN1_MAP), }, { /* VIOS LTH17 */ @@ -448,10 +439,6 @@ static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime) custom_map = byt_rt5651_intmic_in1_in2_map; num_routes = ARRAY_SIZE(byt_rt5651_intmic_in1_in2_map); break; - case BYT_RT5651_IN1_HS_IN3_MAP: - custom_map = byt_rt5651_intmic_in1_hs_in3_map; - num_routes = ARRAY_SIZE(byt_rt5651_intmic_in1_hs_in3_map); - break; default: custom_map = byt_rt5651_intmic_dmic_map; num_routes = ARRAY_SIZE(byt_rt5651_intmic_dmic_map); @@ -696,10 +683,8 @@ 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", "in1" }; - const char * const hsmic_name[] = - { "in2", "in2", "in3", "in3" }; + const char * const intmic_name[] = { "dmic", "in1", "in12" }; + const char * const hsmic_name[] = { "in2", "in3", "in3" }; struct byt_rt5651_private *priv; struct snd_soc_acpi_mach *mach; const char *i2c_name = NULL;