From patchwork Fri Nov 23 14:11:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 151866 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2164494ljp; Fri, 23 Nov 2018 06:12:05 -0800 (PST) X-Google-Smtp-Source: AJdET5fx0hgGOhwMJ58H958VG/8YeUavZ9Q303vAzWBNSLs9NVwXbrBMJpCNxjg2raDo3zgzu10+ X-Received: by 2002:a1c:b607:: with SMTP id g7mr14454569wmf.97.1542982325052; Fri, 23 Nov 2018 06:12:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542982325; cv=none; d=google.com; s=arc-20160816; b=bHJ8r+BEYrpVKSLPEKZU/HtYEkWaMO26WpOkGH98TxPq4ZvbRPm42NtgXngJRrnhOB MWYVSZ8amE/U1HARTfi1oD6ICdVmIMi8bjqhgvbXuqRN9v2wpEXqGvNGqw9CuLyy7fUx CGFRHPtGA8UcO70D/PcKOTg9Hh8YXFhStvgzd9ksRJdCj7q/q4ZnyPP9g254nq2L5zsB oxUzX+DpWii1Za1C65AIa6yMKUgjz2sJKh3zjAKlK5MSIl6RSs8BvUDqpkgpNihwE2SP FYD/Nr0ISgZSs3EVn1y6fk0zvIESiblcPcO4JfK9loIqfCghI0Rvi32/4mW8+R83bkV9 aHJA== 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=EmpnKlvYxK7QdLhYKjIjdRc9O1X8nHl5ciaqSqzaaso=; b=p7yxSPV1nSZSJQmin3kHWb6Q8TqYcoAEci9NXqvabO7cxl7XZZ3KpWKZhkoQEB5w/p mJpiSiODTfichtndwEmKwUf7r026S7g3LIqU3bTpP3nqhAnkS6vpjzHOFAKy06foZ/V8 QYacKHKuIWv8XXeMxok/3YmFANYy1qKJNjWKy6D5NZdAGDNNrL/rdPstEkvJFttJXRXG +H5toQxVV8UNIQi0odj7rjbphjKSWIgsf00vOB1pFseOqou9fZ+WqaCUjX/DpvxY8sy1 9jnI41M+09vAP0uXNB/PbAwX1UHKd2U9xPst/290+njQ8KMfMEv03absUF82onb8ixdY p/dg== 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=aFL9dyMI; 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 m2si5996767wme.142.2018.11.23.06.12.04; Fri, 23 Nov 2018 06:12:05 -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=aFL9dyMI; 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 0CF25267A8B; Fri, 23 Nov 2018 15:12:04 +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 5627F267A8B; Fri, 23 Nov 2018 15:12:01 +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 CE65C267972 for ; Fri, 23 Nov 2018 15:11:59 +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=ye6hxfk/Gv4ImILrBAgSg8qrWeP1wpj6XVG24MngQAw=; b=aFL9dyMI/eTb hgoEdmw9ey9YGRQmGTATPDCTsP9gyZ6NTJzg/t0BMOFomeP9uOHI5FrW4IXjgEJhooJ2W3kZ3SMC2 LbsVgNqVk2XifTYqz/ZqT6lzQi8LvQpxoQhhv+qNDr97velRht+fnDaRB5RV8Ts/P5uk8vCfWS9QS neLws=; 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 1gQCBb-00018J-CK; Fri, 23 Nov 2018 14:11:59 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id BE24A440078; Fri, 23 Nov 2018 14:11:57 +0000 (GMT) From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87r2felyz9.wl-kuninori.morimoto.gx@renesas.com> Message-Id: <20181123141157.BE24A440078@finisterre.ee.mobilebroadband> Date: Fri, 23 Nov 2018 14:11:57 +0000 (GMT) Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: audio-graph-scu-card: tidyup "convert-rate/channels" 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 "convert-rate/channels" 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 7f07a39acf0591fd3823abc1af3c5456e708b77e Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Thu, 22 Nov 2018 00:56:53 +0000 Subject: [PATCH] ASoC: audio-graph-scu-card: tidyup "convert-rate/channels" parsing audio-graph-scu-card.c is supporting "convert-rate/channels" which is used for DPCM. But, sound card might have multi codecs, and each codec might need each convert-rate/channels. This patch supports each codec's convert-rate/channles support. top node convert-rate/channels will overwrite settings if exist. It can't support each codec's convert-rate/channels if sound card had multi codecs without this patch. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/generic/audio-graph-scu-card.c | 7 +++++++ 1 file changed, 7 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 fdc61f1c1d79..0f13f11e0d88 100644 --- a/sound/soc/generic/audio-graph-scu-card.c +++ b/sound/soc/generic/audio-graph-scu-card.c @@ -29,6 +29,7 @@ struct graph_card_data { struct asoc_simple_dai dai; struct snd_soc_dai_link_component codecs; struct snd_soc_dai_link_component platform; + struct asoc_simple_card_data adata; } *dai_props; struct snd_soc_dai_link *dai_link; struct asoc_simple_card_data adata; @@ -85,7 +86,11 @@ static int asoc_graph_card_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params) { struct graph_card_data *priv = snd_soc_card_get_drvdata(rtd->card); + struct graph_dai_props *dai_props = graph_priv_to_props(priv, rtd->num); + + asoc_simple_card_convert_fixup(&dai_props->adata, params); + /* overwrite by top level adata if exist */ asoc_simple_card_convert_fixup(&priv->adata, params); return 0; @@ -170,6 +175,8 @@ static int asoc_graph_card_dai_link_of(struct device_node *ep, PREFIX "prefix"); } + asoc_simple_card_parse_convert(dev, node, PREFIX, &dai_props->adata); + ret = asoc_simple_card_of_parse_tdm(ep, &dai_props->dai); if (ret) return ret;