From patchwork Fri Nov 23 14:12: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: 151868 Delivered-To: patch@linaro.org Received: by 2002:aa7:da0f:0:0:0:0:0 with SMTP id r15csp2200906eds; Fri, 23 Nov 2018 06:12:26 -0800 (PST) X-Google-Smtp-Source: AFSGD/XBCJsKw9wSgEy+2Vgjntr7Bk5wZwyH2w36FsfCQdT/0IE9erQXyYbFQiUhUHyJuad2n2Rv X-Received: by 2002:a5d:6a42:: with SMTP id t2mr15259450wrw.50.1542982346018; Fri, 23 Nov 2018 06:12:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542982346; cv=none; d=google.com; s=arc-20160816; b=jXsbPIjbFMfb6jsjBMxT3URqfEV+OCoyheDZ/Mgwc8jcsHAED7SJqNf0jpsUvABSin UmpKp/yFf8wcStthGqkJInCYqoLMdDGqkihc8hwTpWsEYva+2t41K8MLBrg5aa1V2G+w Al9eafgqe5mVXpyaI/mXTDYuj7ME6bUwTMLTAtdGtlxVn4k1nAREAbLm07+3IZfhcZUp cItSfuZR/JC09jWvYI4emwuV0tQMth7fWw3p5WrV67yl6plJoFgQsaGWCozyKKv2kNMn qv9L0rEbIwAEFTHFCjGeZuZ799MflOTCV2pCffGjoORuKFVxVDgWvmUy5S3qaL5ddhDh 2XRA== 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; bh=G8CO31+7J30HHRYr424CpXXsN7x4AAvRHqS1GYfPZwE=; b=c4KtbIFuvDEpFxBHIJOVvUHVxUeLtHcHKoW3Y70YYa22H7Wz+y+96HNQQDyvNV/vst vh8M0CAZtCUKsOIOdaiCV6S1cpzlMNbA1pTv4d9KgPw+rL4wAzX/8+WWSbr03BBnyMAU SxpoJ0Bd62FUxOFejoMnFMg21oeY61/ELK5dVlrEbKB3VT4gt5UShdnmzclpF8HFrTr8 sGgwwc/qoA6ynFtCmw6+XNNJy8ddyhHewAfRfOtLZkXZ+ziq0j22mmbY2mP2140BKKXZ dPz5zhDKloe3dUo0W6LkSTsvUJIlqRSlwpDRXp8NMzcreu20KgPhk82+alCW/rmDpenR 2GZQ== 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=fEjHpFbb; 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 t2-v6si6038855wmb.51.2018.11.23.06.12.25; Fri, 23 Nov 2018 06:12:26 -0800 (PST) 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=fEjHpFbb; 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 DC1B5267A81; Fri, 23 Nov 2018 15:12:24 +0100 (CET) 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 6BA28267AA2; Fri, 23 Nov 2018 15:12:22 +0100 (CET) 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,RCVD_IN_DNSWL_NONE 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 9F698267A9E for ; Fri, 23 Nov 2018 15:12:20 +0100 (CET) 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=QI1DDPY6ImtV/UbrMpoYAm3z6v6xurLgwh4Oxtokia4=; b=fEjHpFbb8sk8 op7gnr5a4pw4nOwl2Gpt968xjH6ytm5hpcIsJ3BM5lUpIWKQ2dpS8SX04PEEhO68Wta/+qs0JmrCi Y2tRGi4pzWOn6+CTEvTuv3eN5lZFBD6mE9vaG1GtAH5QlYCGYrYDYilZEo+zvy2EVl+u+7yjMPYiF ITU9c=; Received: from [176.12.107.140] (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 1gQCBw-00018X-8f; Fri, 23 Nov 2018 14:12:20 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id D804A440078; Fri, 23 Nov 2018 14:12:18 +0000 (GMT) From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87tvkalz05.wl-kuninori.morimoto.gx@renesas.com> Message-Id: <20181123141218.D804A440078@finisterre.ee.mobilebroadband> Date: Fri, 23 Nov 2018 14:12:18 +0000 (GMT) Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: audio-graph-scu-card: tidyup "prefix" parsing" 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: audio-graph-scu-card: tidyup "prefix" parsing 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 2624fc7882244abeb4dabbd5b67328676a109b6a Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Thu, 22 Nov 2018 00:56:21 +0000 Subject: [PATCH] ASoC: audio-graph-scu-card: tidyup "prefix" parsing audio-graph-scu-card.c is supporting "prefix" which is used to avoid DAI naming conflict when CPU/Codec matching. But, sound card might have multi sub-devices, and each codec might need each prefix. Now, ASoC is supporting snd_soc_of_parse_node_prefix(), let's support it on audio-graph-scu-card, too. It is keeping existing DT style. It can't support each codec's prefix if sound card had multi sub-devices without this patch. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/generic/audio-graph-scu-card.c | 10 ++++++++++ 1 file changed, 10 insertions(+) -- 2.19.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/generic/audio-graph-scu-card.c b/sound/soc/generic/audio-graph-scu-card.c index c46947393f80..fdc61f1c1d79 100644 --- a/sound/soc/generic/audio-graph-scu-card.c +++ b/sound/soc/generic/audio-graph-scu-card.c @@ -39,6 +39,8 @@ struct graph_card_data { #define graph_priv_to_dev(priv) (graph_priv_to_card(priv)->dev) #define graph_priv_to_link(priv, i) (graph_priv_to_card(priv)->dai_link + (i)) +#define PREFIX "audio-graph-card," + static int asoc_graph_card_startup(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; @@ -98,6 +100,7 @@ static int asoc_graph_card_dai_link_of(struct device_node *ep, struct snd_soc_dai_link *dai_link = graph_priv_to_link(priv, idx); struct graph_dai_props *dai_props = graph_priv_to_props(priv, idx); struct snd_soc_card *card = graph_priv_to_card(priv); + struct device_node *node = of_graph_get_port_parent(ep); int ret; if (is_fe) { @@ -154,10 +157,17 @@ static int asoc_graph_card_dai_link_of(struct device_node *ep, if (ret < 0) return ret; + /* check "prefix" from top node */ snd_soc_of_parse_audio_prefix(card, &priv->codec_conf, dai_link->codecs->of_node, "prefix"); + /* check "prefix" from each node if top doesn't have */ + if (!priv->codec_conf.of_node) + snd_soc_of_parse_node_prefix(node, + &priv->codec_conf, + dai_link->codecs->of_node, + PREFIX "prefix"); } ret = asoc_simple_card_of_parse_tdm(ep, &dai_props->dai);