From patchwork Fri Nov 23 14:13:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 151872 Delivered-To: patch@linaro.org Received: by 2002:aa7:da0f:0:0:0:0:0 with SMTP id r15csp2201921eds; Fri, 23 Nov 2018 06:13:09 -0800 (PST) X-Google-Smtp-Source: AFSGD/Vmr3KnjLDGL+wRTDSC3nz1v1cErisr+QddMBArIeVSAYfF5HV/cDLvKIQiFrfn9A/t2XTr X-Received: by 2002:a1c:e354:: with SMTP id a81mr13761198wmh.142.1542982389031; Fri, 23 Nov 2018 06:13:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542982389; cv=none; d=google.com; s=arc-20160816; b=dLgqIOriVcNLA4A4w5/I6B2hXq3bi8yntNhz2zETCW9fLTi8XeHrME+AaXgi0ZBpOC 5cN5YfvHqQazVDxNbzRHHQc/ROKMM39YFoeiZZjyuCpvc5kynI0buDpUUjh5aLkjsjGZ Jj3cz3e3WbWlUH5pndhEKVBJSt0IdnvE4ybE3fNIvR/XarKjrgZ0khRkGsqqLlKfyuC0 Poy7BGuu7cDdUeF/BLKUgeGeyxXF6lQ71xuOw11c59J/1f6/Y3MK6wxtHQQm3wI0i9iH wf1cSZVbMCxk87V6EYc1hPexMmd+LA59REdXP0p/RT7F73eOb3xHTQi2bmlQ+S5lM+oL E73w== 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=zBK1h5hRWVxHG8aevdYjm8Jd+q7IwQKkoDJJw+I5HFA=; b=PpQsykcYjWuj2Sz+339x20UN68tcStgzY9IFb/DWyjlDq9uuYT9vqud4nqbuOMZ3QO LVK5PypdsjghqgXOlas3Umgr5/H3GXx9B9v8d2gQLw5T4WjyW+2f9UknHIGFL+mAXsi6 3KMd8uNVxKUoCC6Uov3smgnOvo4FMPHJZmg4hyIjmt3yCgVkFEIsJj6zUqi6Nttaw6/9 nHCRholN7RS3y2GpjWV1U4W/ywk9E5bkYCqBD6xi0BtCIDc3rra7mL8dAgyS9fAh8wwp voK1/frLeUNv4aw1g6uy4nRlmyXKPz9MmRfRxcO5oq4ch1EDVlKHAEQ9XP+zcO3HhqDb 3rQQ== 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=GfBwzXnC; 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 w9si1066804wmb.26.2018.11.23.06.13.08; Fri, 23 Nov 2018 06:13:09 -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=GfBwzXnC; 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 D8C7C267A75; Fri, 23 Nov 2018 15:13:07 +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 66EAF267A75; Fri, 23 Nov 2018 15:13:05 +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 BA199267929 for ; Fri, 23 Nov 2018 15:13:03 +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=cpEc9y83g+IIhhxPWWTzXXX5vzqE3TV26tWdIq7Z2TA=; b=GfBwzXnC8xzp cE4DmBrAnuHsdAz+blG5KAZIUsRPXxaFsqDxK9/nnYxJ0Y4terTmyiyCE9EWgMxdZvrgsTkPraN5s bcbtVBw++KEKGts8UxFNbJZ8NFvUzk+8vrPRbdZhjtHxoQXCTq8kB2QfMl3STTiVeayN0nZ7Q+ilh lHjbU=; 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 1gQCCd-000191-AT; Fri, 23 Nov 2018 14:13:03 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id CAD48440078; Fri, 23 Nov 2018 14:13:01 +0000 (GMT) From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87zhu2lz26.wl-kuninori.morimoto.gx@renesas.com> Message-Id: <20181123141301.CAD48440078@finisterre.ee.mobilebroadband> Date: Fri, 23 Nov 2018 14:13:01 +0000 (GMT) Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: soc-core: add snd_soc_of_parse_node_prefix()" 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: soc-core: add snd_soc_of_parse_node_prefix() 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 3b7103562c03cffb1a351f8c235b3bba2acd9e9b Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Thu, 22 Nov 2018 00:55:09 +0000 Subject: [PATCH] ASoC: soc-core: add snd_soc_of_parse_node_prefix() Current ASoC has snd_soc_of_parse_audio_prefix() to get codec_conf settings from DT which is used to avoid DAI naming conflict when CPU/Codec matching. Currently, it is parsing from "top node", but, we want to parse from "each sub node" if sound card had multi cpus/codecs. This patch adds new snd_soc_of_parse_node_prefix() to allow parsing settings from selected node. It is keeping existing snd_soc_of_parse_audio_prefix() by using macro. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- include/sound/soc.h | 6 +++++- sound/soc/soc-core.c | 11 +++++------ 2 files changed, 10 insertions(+), 7 deletions(-) -- 2.19.1 _______________________________________________ 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 5a8b84140f01..93b7510e7f7d 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1477,10 +1477,14 @@ int snd_soc_of_parse_tdm_slot(struct device_node *np, unsigned int *rx_mask, unsigned int *slots, unsigned int *slot_width); -void snd_soc_of_parse_audio_prefix(struct snd_soc_card *card, +void snd_soc_of_parse_node_prefix(struct device_node *np, struct snd_soc_codec_conf *codec_conf, struct device_node *of_node, const char *propname); +#define snd_soc_of_parse_audio_prefix(card, conf, node, name) \ + snd_soc_of_parse_node_prefix((card)->dev->of_node, \ + (conf), (node), (name)) + int snd_soc_of_parse_audio_routing(struct snd_soc_card *card, const char *propname); unsigned int snd_soc_of_parse_daifmt(struct device_node *np, diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 6ddcf12bc030..012000de4bf0 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3484,12 +3484,11 @@ int snd_soc_of_parse_tdm_slot(struct device_node *np, } EXPORT_SYMBOL_GPL(snd_soc_of_parse_tdm_slot); -void snd_soc_of_parse_audio_prefix(struct snd_soc_card *card, - struct snd_soc_codec_conf *codec_conf, - struct device_node *of_node, - const char *propname) +void snd_soc_of_parse_node_prefix(struct device_node *np, + struct snd_soc_codec_conf *codec_conf, + struct device_node *of_node, + const char *propname) { - struct device_node *np = card->dev->of_node; const char *str; int ret; @@ -3502,7 +3501,7 @@ void snd_soc_of_parse_audio_prefix(struct snd_soc_card *card, codec_conf->of_node = of_node; codec_conf->name_prefix = str; } -EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_prefix); +EXPORT_SYMBOL_GPL(snd_soc_of_parse_node_prefix); int snd_soc_of_parse_audio_routing(struct snd_soc_card *card, const char *propname)