From patchwork Wed Jun 27 11:31:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 140316 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp743396ljj; Wed, 27 Jun 2018 04:31:30 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcpus9eR0LCBiSxBY37J73t9jGwU0kPdT28FFXHAYndjAS1PJ/xF/s/32tdg4MJpz0EOpQu X-Received: by 2002:a1c:42d7:: with SMTP id k84-v6mr4558597wmi.159.1530099090334; Wed, 27 Jun 2018 04:31:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530099090; cv=none; d=google.com; s=arc-20160816; b=YJLcyIOn1MiKIX5igIJ2RdV7StKG+pCQrQ63xG0hao9Lm6Frpg8WyQWRAOh6zG/GE/ erdeTIwbIoQJPhdQYV3qDay8SZUVyIuYbD1NifyA2y5+XWg/3o2D7n3TJAAWqXYr/UzR V/C3PQyxTWDl98W0pXP8Qs42Y11XK8ldAV2sAuuF8OTO5WeHtajQ9r6i/4UAmmNrjPXR HZPoIInlMvmKfJQQYATaNzPgKL9Tyrf0ZVP10TB4Fht9pkv9diW3OuXcvpDeNdG3z0Sr r4g1GodrEbhxxi5RzdIAAojXswgH9d3JCUq7AGDBCgQ+nLZgXzSgmPna6o7KujG1NL8a H49w== 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=Swc/jb0llp1uxBUiqOeuujP7bOY7tq3cV/7vWnWbCvo=; b=yREBysok4Y7H5NFqSZen2X15sssYvHPMLQiHMpD0XTrZDjQVgBne3SZ04PlOg+kxsM H+USDUJ425zfCZ7a5jFV5dpbggV44S5HYTv1rreeogPMvkEUokbFRFzwbkHlUGsX0DmP xnOWtH1f4ojklKBwbtyqu8kDz2RS3PfSan3MnZNKLlXkMgrxoQxDlhME6jl0k2j3z0aE Ir6o70FdeTTCIjjy4cQJC4OPhbOKM0iyyPnMIYLN4Apu70xWTwwceqvSUVV3fsWrAinJ aYhlkDDf/oNUU19KFYdGPRP2GMuojQHIipeJHiQ3+yJSN91uu+0vJp5pyWPNU8IsKCvK 8J8w== 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="vNMaL/Sc"; 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 w201-v6si3874986wmw.64.2018.06.27.04.31.30; Wed, 27 Jun 2018 04:31:30 -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="vNMaL/Sc"; 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 EB91C267983; Wed, 27 Jun 2018 13:31:28 +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 C68C2267983; Wed, 27 Jun 2018 13:31:26 +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 E0D5026797D for ; Wed, 27 Jun 2018 13:31:24 +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=l2kwbByFjvdkiCVo/Nz8HRwlyJxJVDg416k4BFNoHfM=; b=vNMaL/Scu6ev SYyKZK6nVhK7t2L2IQA6OQ1bWvJ11OKB818+Ei7gAPncQIPfnvwssf+8EJ4PFxwXmIRcOqvt9TEal Yt+qz3PWrATkS9qCj7bOXu/aOVPGMx3/swRU+wxj6w8w010uiwqlrnSW9U8koG2MLe7aOnlmp2w6A m4HKY=; 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 1fY8fU-0002wE-5g; Wed, 27 Jun 2018 11:31:24 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 24D6D440070; Wed, 27 Jun 2018 12:31:23 +0100 (BST) From: Mark Brown To: Hans de Goede In-Reply-To: <20180624140634.16835-8-hdegoede@redhat.com> Message-Id: <20180627113123.24D6D440070@finisterre.ee.mobilebroadband> Date: Wed, 27 Jun 2018 12:31:23 +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: Simplify card long-name" 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: Simplify card long-name 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 8e69cd640097fa7af53fb476dbd3597608f32b10 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 24 Jun 2018 16:06:32 +0200 Subject: [PATCH] ASoC: Intel: bytcr_rt5651: Simplify card long-name Now that the headset-mic is always IN3 there is no reason to have the headset-mic mapping in the long-name. This commit simplifies the long name to "bytcr-rt5651--mic". We can safely do this without causing regressions (UCM profile not found due to the longname change) as the UCM profiles are not in upstream alsa-lib yet. Signed-off-by: Hans de Goede Reviewed-by: Pierre-Louis Bossart Signed-off-by: Mark Brown --- sound/soc/intel/boards/bytcr_rt5651.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 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 042334d9be32..e778142b8a6e 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -662,7 +662,7 @@ static struct snd_soc_card byt_rt5651_card = { static char byt_rt5651_codec_name[SND_ACPI_I2C_ID_LEN]; static char byt_rt5651_codec_aif_name[12]; /* = "rt5651-aif[1|2]" */ static char byt_rt5651_cpu_dai_name[10]; /* = "ssp[0|2]-port" */ -static char byt_rt5651_long_name[40]; /* = "bytcr-rt5651-*-spk-*-mic" */ +static char byt_rt5651_long_name[40]; /* = "bytcr-rt5651-*-mic" */ static bool is_valleyview(void) { @@ -683,8 +683,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[] = { "in3", "in3", "in3" }; + const char * const mic_name[] = { "dmic", "in1", "in12" }; struct byt_rt5651_private *priv; struct snd_soc_acpi_mach *mach; const char *i2c_name = NULL; @@ -831,9 +830,8 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) } snprintf(byt_rt5651_long_name, sizeof(byt_rt5651_long_name), - "bytcr-rt5651-%s-intmic-%s-hsmic", - intmic_name[BYT_RT5651_MAP(byt_rt5651_quirk)], - hsmic_name[BYT_RT5651_MAP(byt_rt5651_quirk)]); + "bytcr-rt5651-%s-mic", + mic_name[BYT_RT5651_MAP(byt_rt5651_quirk)]); byt_rt5651_card.long_name = byt_rt5651_long_name; ret_val = devm_snd_soc_register_card(&pdev->dev, &byt_rt5651_card);