From patchwork Fri Jun 23 12:03:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 106255 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp170180qgd; Fri, 23 Jun 2017 05:04:52 -0700 (PDT) X-Received: by 10.223.171.69 with SMTP id r5mr6034243wrc.57.1498219491899; Fri, 23 Jun 2017 05:04:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498219491; cv=none; d=google.com; s=arc-20160816; b=S0+y4tkh7FOF0vn3xS+hRxN8wZOYXprMomUb4AnrNvi7HuRyOgUlYogXO6Fr5DQPwI FzefFoj1PV+0jynfURIJI2t/Jh6tkXLiYRKB0c8406w+U3redwVfIcGFUojS5eH0eijy mcG0698wwaRMWL/FEhI2z4XgnoPJbx4xa3HZeU4YoEFsgLuU05g8uMsNf9ms1RCebDQ3 He3SiWUDs3eHxlj/INfU9TwXBOzRWLyUhA4OzMDnOYqS4fVGQoSBrWafD6KR4UMkyxWB 4sP/FN0o4W8SlXExI8eFRzUB6sdECstp3QqC9oWrlgMvGGB3kiuWQvazvHjFQcoZL0r1 I8Bw== 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 :delivered-to:arc-authentication-results; bh=8cPRmauUgqtwejFAdxw7noExf7F22lNNAlYTyItLrqY=; b=fp2Hd7U99W29rAbB0OHN8bElsl05PoHaPJXRuHrsFHf1l9fAyH+IyYjnQAjsVV2OIR yBnVdVbRofexYzfQ7Vhb0drXnmmIBl6ZwX7TaqVhjGJUMqZ/MDvhYXU3hBqM+Svn7JRR GZfmI1/qO/+4ltJ6nCU/wsK99EjrboefFYuvkUqxOUtMn6jgom021e7rFvoaTW9z8n+v dj/YaIvg/GAxRO9Th1Ci+Uu4DVMTcUfgmV2GVBtOLAFFZblQgEjM6Bt2H9A/Qg0f+Ibw 2Pt+WSBvNrUsTHx9mFV+98p68Ux6zJA7K8KyWzzhzJYySAREKENyGnRVq9iom34MMnPL p6Qg== ARC-Authentication-Results: i=1; mx.google.com; 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 i4si4299430wrb.191.2017.06.23.05.04.51; Fri, 23 Jun 2017 05:04:51 -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; 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 203722674AC; Fri, 23 Jun 2017 14:04:21 +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 09F99267499; Fri, 23 Jun 2017 14:04:02 +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.0 required=5.0 tests=RCVD_IN_DNSWL_NONE, SPF_PASS, T_RP_MATCHES_RCVD autolearn=disabled version=3.4.0 Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [106.187.55.193]) by alsa0.perex.cz (Postfix) with ESMTP id 78B46266D46 for ; Fri, 23 Jun 2017 14:03:56 +0200 (CEST) Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1dONJX-0003WS-66; Fri, 23 Jun 2017 12:03:53 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1dONJU-0006Lg-JB; Fri, 23 Jun 2017 13:03:48 +0100 From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87h8z8czsk.wl%kuninori.morimoto.gx@renesas.com> Message-Id: Date: Fri, 23 Jun 2017 13:03:48 +0100 X-SA-Exim-Connect-IP: 2001:470:1f1d:6b5::3 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: No (on mezzanine.sirena.org.uk); Unknown failure Cc: linux-renesas-soc@vger.kernel.org, alsa-devel@alsa-project.org, Mark Brown , Simon Subject: [alsa-devel] Applied "ASoC: audio-graph-scu-card: tidyup asoc_simple_card_canonicalize_cpu() parameter" 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 asoc_simple_card_canonicalize_cpu() parameter has been applied to the asoc tree at git://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 32f2bcce3ed10b93236d747701a9c04d51626cc2 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Thu, 22 Jun 2017 06:22:14 +0000 Subject: [PATCH] ASoC: audio-graph-scu-card: tidyup asoc_simple_card_canonicalize_cpu() parameter asoc_simple_card_canonicalize_cpu() 2nd param is asking CPU component's DAI links, not Card links. This patch fixup it. Otherwise, audio-graph-card can't handle CPU component correctly if CPU has mult-DAIs and Card uses only one of them Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/generic/audio-graph-scu-card.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.13.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 05934b24627b..061c7a60d6b4 100644 --- a/sound/soc/generic/audio-graph-scu-card.c +++ b/sound/soc/generic/audio-graph-scu-card.c @@ -125,7 +125,7 @@ static int asoc_graph_card_dai_link_of(struct device_node *ep, /* card->num_links includes Codec */ asoc_simple_card_canonicalize_cpu(dai_link, - (card->num_links - 1) == 1); + of_graph_get_endpoint_count(dai_link->cpu_of_node) == 1); } else { /* FE is dummy */ dai_link->cpu_of_node = NULL;