From patchwork Tue Apr 17 17:09:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 133557 Delivered-To: patch@linaro.org Received: by 10.46.84.18 with SMTP id i18csp4949185ljb; Tue, 17 Apr 2018 10:09:42 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+Ln7CW5WZZsH7wr6J/piEciVk9pB24SdseOTA8SIdkoCt3NQT7h1kzJtGk8Fk9lHiDd6KY X-Received: by 10.223.184.89 with SMTP id u25mr2357997wrf.162.1523984982101; Tue, 17 Apr 2018 10:09:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523984982; cv=none; d=google.com; s=arc-20160816; b=KNm2AxnMGdm0W3Td7eXPU2GZdhXMVpKf3DHfz13+zJGdlGXpYwIqR+ZZd+E4xCW+he 7QuLtaJ+yEPLgpFL5KvD9mVi8wo5Cb0UjlbpC/p0502hNm9rS/UxsUlOw/aWImrD0hm6 0ivStTusBlzpINNHjVyYWx9c6V9EMx6kjdDaHhJJ6HDTkgYFSOHti1FM/Xif6ZzgXsu6 G87lPyBj8iELc33mS9y4CvaOvBev2B0i1vOx5Tp83mHbWtw6rH/4kVhg6gHsYglopPOe CXOwOwOzpTpJyiH1Ibg9a+KVsok7gfOUhjX5WWN9aDNwSum7XAvDRzbBpqypebZW2dNM NGWQ== 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=Bh75FXIkpd/zf6tZbJIcIAHqt/BYfQZhByJm0SCLE3I=; b=cTCtyJ2ARLiZx/A0Pp0XhHpJasf5QLDv9JI4zmeH/uKlvZ31pUZytdaXyN8RW54VLf lVovc8mehUiFJB8Yay445TtWDXX7CMnmuAXWst4zyM97uCjQ3LKyD3jiA5SDwUasS4PW mzdS8/EemiqUWA0kgUD9SJbMpyrVtY7RKL/Jo8D263yPP9SXZpkrFtrd7uEmtbQsuqeC AiEkaeb9qOQhPzJOcudj4vXgTaWCFez90YvxOv475Vr1dH+uXrcLi8BRpbw+pn0oQUmY wYy5mi8a31XTFaJeER9RLhXvBycd+BplLMkvb3tU2nb4pQ6vrKerQCzRPhyTb5c7EfeV hWYA== 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=UpvR+J8g; 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 c2si6003488wre.238.2018.04.17.10.09.41; Tue, 17 Apr 2018 10:09:42 -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=UpvR+J8g; 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 996D0267628; Tue, 17 Apr 2018 19:09:24 +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 1A18E267616; Tue, 17 Apr 2018 19:09:22 +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.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, 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 73BCA266C99 for ; Tue, 17 Apr 2018 19:09:20 +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=Kt9IeDk/9302S6uKmyxBty3xYUuaicYiTvM95aiPMeI=; b=UpvR+J8gey84 e3ohtteLMCRQQwjow2t6AX6mJwpgvKnEQOSxqwOyFc7WXOQpLR/J4DqhC8zSdHhGtw3J6IEAnPYA1 LAsy8Ut+eIL9oYitjePTG6Tm7t/eKQcvByd9PCvS8MAYRxUaCAU3WEoaTGpeQ5+HNP7KhbfOSHjwT sZMr4=; 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 1f8U6Y-0007tf-Lx; Tue, 17 Apr 2018 17:09:18 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1f8U6Y-0001cd-7Y; Tue, 17 Apr 2018 18:09:18 +0100 From: Mark Brown To: Liam Girdwood In-Reply-To: <20180314202511.13614-1-liam.r.girdwood@linux.intel.com> Message-Id: Date: Tue, 17 Apr 2018 18:09:18 +0100 Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: core: Add name prefix for machines with topology rewrites" 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: core: Add name prefix for machines with topology rewrites 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 f11a5c27f9287cacad74af31cd92d4413eccc05a Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Tue, 27 Mar 2018 14:30:41 +0100 Subject: [PATCH] ASoC: core: Add name prefix for machines with topology rewrites Signed-off-by: Liam Girdwood Signed-off-by: Mark Brown --- include/sound/soc.h | 2 ++ sound/soc/soc-core.c | 8 ++++++++ 2 files changed, 10 insertions(+) -- 2.17.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/include/sound/soc.h b/include/sound/soc.h index fac4ff04fb7d..3676d0a8f532 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1015,6 +1015,7 @@ struct snd_soc_platform_driver { /* this platform uses topology and ignore machine driver FEs */ const char *ignore_machine; + const char *topology_name_prefix; int (*be_hw_params_fixup)(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params); bool use_dai_pcm_id; /* use the DAI link PCM ID as PCM device number */ @@ -1167,6 +1168,7 @@ struct snd_soc_card { const char *long_name; const char *driver_name; char dmi_longname[80]; + char topology_shortname[32]; struct device *dev; struct snd_card *snd_card; diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 8f01fe8296ff..aa1c33b3cce0 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2143,6 +2143,14 @@ static void soc_check_tplg_fes(struct snd_soc_card *card) if (!dai_link->stream_name) dai_link->stream_name = dai_link->name; } + + /* Inform userspace we are using alternate topology */ + if (platform->driver->topology_name_prefix) { + snprintf(card->topology_shortname, 32, "%s-%s", + platform->driver->topology_name_prefix, + card->name); + card->name = card->topology_shortname; + } } }