From patchwork Sun Oct 13 19:00:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Baluta X-Patchwork-Id: 176077 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp3631500ill; Sun, 13 Oct 2019 12:00:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqxKHEIIbxtSqZO5ezdbQUPbrNWmYNPqAtEd2eH1NUvUhAofU1Q1MC6f4lPb4LiY8PSPAU/a X-Received: by 2002:a17:906:1342:: with SMTP id x2mr24934283ejb.304.1570993225395; Sun, 13 Oct 2019 12:00:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570993225; cv=none; d=google.com; s=arc-20160816; b=YzoL+QKJP69v+TJPGIB8QD6NXMRf44dBtSngChs4V0RsQd5YyBGLlE/qX0+jyW4r68 dNpI23xXe3Gtf6ctdVobA+sYhuskRfEpolQ4Hh7atn0Hj+XMAMy5V55/rh6rHdJT+yqD R56WDW8mlRCDMm+JUfhwQoAi22eJz5VuFiQAZzbKOenwEtsUjPbeVAyzzTdrTQIjs2iu HPKvX1aOFJ+xcnHjfjKipYYRD0cA89KJo+xskKDNjk4OgHtNpmtjjIia7Kv8avUCqG5k zKG0VXomVqTAmbpB945n0z2dL48+iaaoAN0rDoYcZwoAW7817RNBPgUERP1pr/RzG8xy P8+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=dxsIOwPJo4PELbvpVkrr0fKVX0nc1U1xsVfVoWqc/jw=; b=D37Vd5gqX3HHiQVxAL1X9CeYie3cJV6f8CLG4ZUTcCzlz1XW5/B6KPklzi+alCArWL Tw1Et4wwjYPXDiSYcZwHuc65oOS84hAv2MfZ5p62W5AhGXdNKuhHGCIm/FE/h/W6BJzT 7prJ1wylIo5RnJOLnu1SGkj+SbOuxtH6Sl1qvvnPaC8gMdNWnjuOe2jmuqt3CYfXTfTx Mz2Ni97FYOW2hu/MoREHm3XZuBYCTIx6bpIdy4ITJIgu4/cym0ms9Xb5ip98RY8Xya5G gYi5DL3C4+kCmBi+xH2qL0pXst9YjBsPf7kZ9Dt34NjWFr4/UaJiUQuYNKN9+xIWG4K9 onzQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d43si10345152edb.73.2019.10.13.12.00.25; Sun, 13 Oct 2019 12:00:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729469AbfJMTAX (ORCPT + 9 others); Sun, 13 Oct 2019 15:00:23 -0400 Received: from inva021.nxp.com ([92.121.34.21]:39256 "EHLO inva021.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728786AbfJMTAT (ORCPT ); Sun, 13 Oct 2019 15:00:19 -0400 Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id C8C2D200190; Sun, 13 Oct 2019 21:00:16 +0200 (CEST) Received: from inva024.eu-rdc02.nxp.com (inva024.eu-rdc02.nxp.com [134.27.226.22]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id C5EB220014F; Sun, 13 Oct 2019 21:00:16 +0200 (CEST) Received: from fsr-ub1864-103.ea.freescale.net (fsr-ub1864-103.ea.freescale.net [10.171.82.17]) by inva024.eu-rdc02.nxp.com (Postfix) with ESMTP id 38E072059D; Sun, 13 Oct 2019 21:00:16 +0200 (CEST) From: Daniel Baluta To: perex@perex.cz, tiwai@suse.com, broonie@kernel.org, kuninori.morimoto.gx@renesas.com Cc: lgirdwood@gmail.com, robh+dt@kernel.org, alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-imx@nxp.com, Daniel Baluta Subject: [RFC PATCH 1/2] ASoC: simple-card: Introduce force-dpcm DT property Date: Sun, 13 Oct 2019 22:00:13 +0300 Message-Id: <20191013190014.32138-2-daniel.baluta@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191013190014.32138-1-daniel.baluta@nxp.com> References: <20191013190014.32138-1-daniel.baluta@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Until now dai_link uses dynamic PCM in the following conditions: * it is dpcm_selectable (this means compatible string is simple-scu-card) * it has convert-xxx property * or it has more than one CPU DAIs Our use case requires to be able to build a DPCM link with just 1 CPU. Add force-dpcm DT property to realize this. Signed-off-by: Daniel Baluta --- include/sound/simple_card_utils.h | 4 ++++ sound/soc/generic/simple-card-utils.c | 17 +++++++++++++++++ sound/soc/generic/simple-card.c | 25 +++++++++++++++++++++++-- 3 files changed, 44 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h index 985a5f583de4..0578bbfa4a24 100644 --- a/include/sound/simple_card_utils.h +++ b/include/sound/simple_card_utils.h @@ -48,6 +48,7 @@ struct asoc_simple_priv { struct asoc_simple_data adata; struct snd_soc_codec_conf *codec_conf; unsigned int mclk_fs; + unsigned int force_dpcm; } *dai_props; struct asoc_simple_jack hp_jack; struct asoc_simple_jack mic_jack; @@ -120,6 +121,9 @@ void asoc_simple_convert_fixup(struct asoc_simple_data *data, void asoc_simple_parse_convert(struct device *dev, struct device_node *np, char *prefix, struct asoc_simple_data *data); +void asoc_simple_parse_force_dpcm(struct device *dev, + struct device_node *np, char *prefix, + unsigned int *force_dpcm); int asoc_simple_parse_routing(struct snd_soc_card *card, char *prefix); diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index 9b794775df53..2f03a73f8a8a 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -52,6 +52,23 @@ void asoc_simple_parse_convert(struct device *dev, } EXPORT_SYMBOL_GPL(asoc_simple_parse_convert); +void asoc_simple_parse_force_dpcm(struct device *dev, + struct device_node *np, + char *prefix, + unsigned int *force_dpcm) +{ + char prop[128]; + + if (!prefix) + prefix = ""; + + /* dpcm property */ + snprintf(prop, sizeof(prop), "%s%s", prefix, "force-dpcm"); + if (of_find_property(np, prop, NULL)) + *force_dpcm = 1; +} +EXPORT_SYMBOL_GPL(asoc_simple_parse_force_dpcm); + int asoc_simple_parse_daifmt(struct device *dev, struct device_node *node, struct device_node *codec, diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index fc9c753db8dd..e40e22c8813b 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -92,6 +92,21 @@ static void simple_parse_convert(struct device *dev, of_node_put(node); } +static void simple_parse_force_dpcm(struct device *dev, + struct device_node *np, + unsigned int *force_dpcm) +{ + struct device_node *top = dev->of_node; + struct device_node *node = of_get_parent(np); + + asoc_simple_parse_force_dpcm(dev, top, PREFIX, force_dpcm); + asoc_simple_parse_force_dpcm(dev, node, PREFIX, force_dpcm); + asoc_simple_parse_force_dpcm(dev, node, NULL, force_dpcm); + asoc_simple_parse_force_dpcm(dev, np, NULL, force_dpcm); + + of_node_put(node); +} + static void simple_parse_mclk_fs(struct device_node *top, struct device_node *cpu, struct device_node *codec, @@ -372,6 +387,7 @@ static int simple_for_each_link(struct asoc_simple_priv *priv, struct asoc_simple_data adata; struct device_node *codec; struct device_node *np; + unsigned int force_dpcm = 0; int num = of_get_child_count(node); /* get codec */ @@ -387,15 +403,20 @@ static int simple_for_each_link(struct asoc_simple_priv *priv, for_each_child_of_node(node, np) simple_parse_convert(dev, np, &adata); + /* get force-dpcm property */ + for_each_child_of_node(node, np) + simple_parse_force_dpcm(dev, np, &force_dpcm); + /* loop for all CPU/Codec node */ for_each_child_of_node(node, np) { /* * It is DPCM * if it has many CPUs, - * or has convert-xxx property + * or it has convert-xxx property + * or it has force-dpcm property */ if (dpcm_selectable && - (num > 2 || + (num > 2 || force_dpcm || adata.convert_rate || adata.convert_channels)) ret = func_dpcm(priv, np, codec, li, is_top); /* else normal sound */ From patchwork Sun Oct 13 19:00:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Baluta X-Patchwork-Id: 176076 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp3631480ill; Sun, 13 Oct 2019 12:00:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqzf6ZxYvqoiAGWFu9T9Pcj8C+tSOXbNUzYnUbn7CRQdX8D30IAgiZBEKLXyjQIEfWKf0FlT X-Received: by 2002:aa7:de1a:: with SMTP id h26mr24899996edv.289.1570993224300; Sun, 13 Oct 2019 12:00:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570993224; cv=none; d=google.com; s=arc-20160816; b=heX0QDGWUS2xLFTJGOUp32LbDJ+FLnLzgIMvL4o59gq9nh/XhGZAVmv3mRRqV24UaY CalnnRNlI7o0rG70Sjz7iC2k/kHApTpnfQUYV/sdnbj6iiLADx62jpw9N+LqOSHuBNnG lIsG1Xl6qECgiom2JUXthJpkRvdrlahjpE7HUWB18zal5FLtSWZ9nMN1Q8pv78PeJ14B wTFMkNCMx0GeY2zkbnJuyrNwBItLeG1Dder/VwVfRVYvbgbqZ1J9xb4e2o+wgWvpsRac +k85QFW8TNK8HVjk/H99/r52EDbXfBx57DW3t8vTiznJMObUARap85hmIQhaUyKZ5Aek ujxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=4/PSumcOPUTH6BDWcHhzonJpVxh0gaEaaNu5ZaWNEcA=; b=Wo2Bdh7iS2qZVaXlQPJ0weLMchW6OKnDzWCtd52JEM6ssUq+7iORttqjIPe+aUEeSO ZtYh8g42xCE1t4L0pdV7/1VicY5hGhMUBFTkd/2jmohwUdopThIW5w4Q5011YqvYhn+i /wgK5UVu4yLtHLlHNHph3eUhn5ZzEVMaHMdEGFx4HW+ZssSZ+vsa5r4QG2RHVJvRX932 QF1YtvhJR4xCYGx4aIjE8lz3PR/rB8TKe62/Wpfw9v94tpqaC4HVkGknIL1NVE4DBGbS 9n/k9/Q06SohGkGTYPPEzKItCy6jcej20nhe7rZFHQEE2EpTubCYG2Ot98vyto40Lo2+ xl9A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d43si10345152edb.73.2019.10.13.12.00.24; Sun, 13 Oct 2019 12:00:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729447AbfJMTAU (ORCPT + 9 others); Sun, 13 Oct 2019 15:00:20 -0400 Received: from inva021.nxp.com ([92.121.34.21]:39270 "EHLO inva021.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729362AbfJMTAT (ORCPT ); Sun, 13 Oct 2019 15:00:19 -0400 Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 70AEB20073C; Sun, 13 Oct 2019 21:00:17 +0200 (CEST) Received: from inva024.eu-rdc02.nxp.com (inva024.eu-rdc02.nxp.com [134.27.226.22]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 6DEBC20014F; Sun, 13 Oct 2019 21:00:17 +0200 (CEST) Received: from fsr-ub1864-103.ea.freescale.net (fsr-ub1864-103.ea.freescale.net [10.171.82.17]) by inva024.eu-rdc02.nxp.com (Postfix) with ESMTP id D896B2059D; Sun, 13 Oct 2019 21:00:16 +0200 (CEST) From: Daniel Baluta To: perex@perex.cz, tiwai@suse.com, broonie@kernel.org, kuninori.morimoto.gx@renesas.com Cc: lgirdwood@gmail.com, robh+dt@kernel.org, alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-imx@nxp.com, Daniel Baluta Subject: [RFC PATCH 2/2] ASoC: simple-card: Add documentation for force-dpcm property Date: Sun, 13 Oct 2019 22:00:14 +0300 Message-Id: <20191013190014.32138-3-daniel.baluta@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191013190014.32138-1-daniel.baluta@nxp.com> References: <20191013190014.32138-1-daniel.baluta@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This property can be global in which case all links created will be DPCM or present in certian dai-link subnode in which case only that specific link is forced to be DPCM. Signed-off-by: Daniel Baluta --- Documentation/devicetree/bindings/sound/simple-card.txt | 1 + 1 file changed, 1 insertion(+) -- 2.17.1 diff --git a/Documentation/devicetree/bindings/sound/simple-card.txt b/Documentation/devicetree/bindings/sound/simple-card.txt index 79954cd6e37b..15e6f5329857 100644 --- a/Documentation/devicetree/bindings/sound/simple-card.txt +++ b/Documentation/devicetree/bindings/sound/simple-card.txt @@ -63,6 +63,7 @@ Optional dai-link subnode properties: - mclk-fs : Multiplication factor between stream rate and codec mclk, applied only for the dai-link. +- force-dpcm : Indicates dai-link is always DPCM. For backward compatibility the frame-master and bitclock-master properties can be used as booleans in codec subnode to indicate if the