From patchwork Fri Nov 23 14:12:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 151870 Delivered-To: patch@linaro.org Received: by 2002:aa7:da0f:0:0:0:0:0 with SMTP id r15csp2201373eds; Fri, 23 Nov 2018 06:12:47 -0800 (PST) X-Google-Smtp-Source: AFSGD/U8GW+hHSfQtjUIDpUEsD/uDDsnqTMW1aplLjQDHTZw/tflQQRME0UnmsfcRzbH78aRUrle X-Received: by 2002:a1c:e81:: with SMTP id 123mr8850657wmo.148.1542982366975; Fri, 23 Nov 2018 06:12:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542982366; cv=none; d=google.com; s=arc-20160816; b=nxO+0bwx/QJquhQHtZW5sT8WkH+WUnrr0YpZ9owiIO0fsrHu0xipSCpbCiSWZu5ivj bGZByswddNDmeJyOcY7/cLf0Cb/7MvjCB35AAykhN3ejEoMhQ3cFVt88blFQJnr+ckOS SOlVbSVz6SJe1uvrvGkh0bQ2vKtmDEMuTR19s7CwGR51fhtBZwinmoeSJsxN1EljZWSM 1+4hhqsZCNO8+9PQQ8+MiERKCkIQgdC/9NsZOTHu66pN2+fA//4UmUTFzLmv9UAokQgE WCnBi4B5Zd0P80c7oVcDUxcf+TwW6qt21z64vnCK9oUCgjn6T0+MnCjjHuBASPlvCaT9 vJ6w== 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=1JPsASrlDjlVLtegm6RldHpHWCVko6fXvcYPUHlHJ3c=; b=TVVb0zwe0LVpU+aDDj9coVWNItZzfWxS722DsWKEElMSfSZi4vYNQ/O4Q78/rt5N+g 3NjFkWLbpfP5VpBpmYDGIakKCMm8Xe5OejjfacbG/LwfVKCMtnjMdT2lGtWNpGSW3CZo k8hyPlu7vrD3cPeQ8rk3EJ8JTMZ4VaPrCR7RZ3yDWjts+DCD7wOhRpr+QJnVnGB0F3vC u4vhHOHDAPVTNl2glvjU4EaDxp6kKPbQsvFzoEXs/5ZK0W2dj807n398ZDg7CpMW5pF3 SFI6JEYXsr/uyTBLd+wvKMq4zAii0vi0iodav7GZLDGQxkx00p/0XUOdzI/eFib0eXmd 2TQA== 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="GM7DBi/N"; 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 y14si19788838wrn.359.2018.11.23.06.12.46; Fri, 23 Nov 2018 06:12:46 -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="GM7DBi/N"; 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 DC292267AA8; Fri, 23 Nov 2018 15:12:45 +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 95D3E267A9C; Fri, 23 Nov 2018 15:12:44 +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 20A65267929 for ; Fri, 23 Nov 2018 15:12:43 +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=FTH4rkiFd+kst8h8mAZvOKYjFiD1aCDwZoe8QrnnoiA=; b=GM7DBi/NWfCN QSp+a0y2MEs9R3UNcVWBjOgl71yIrX3d5meN3kKBihMGgcbxwQnYubGIeYaQNxI6nj3o3VoooJeIk 9F3orBX+RBHQm4ZseyM8aKp4QlunYajTjwTNM0yTKudigQBzYwuFzAAHCD7V5hTkX3Pi5WkatqKxz wRA8I=; 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 1gQCCI-00018p-Pk; Fri, 23 Nov 2018 14:12:42 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 3AF1D440078; Fri, 23 Nov 2018 14:12:41 +0000 (GMT) From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87wop6lz1a.wl-kuninori.morimoto.gx@renesas.com> Message-Id: <20181123141241.3AF1D440078@finisterre.ee.mobilebroadband> Date: Fri, 23 Nov 2018 14:12:41 +0000 (GMT) Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: simple-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: simple-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 ca8d95c709378d0792c9dbacdab176a75e521ffb Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Thu, 22 Nov 2018 00:55:40 +0000 Subject: [PATCH] ASoC: simple-scu-card: tidyup "prefix" parsing simple-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/simple-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/simple-scu-card.c b/sound/soc/generic/simple-scu-card.c index e650143eb532..7ae1901b2f85 100644 --- a/sound/soc/generic/simple-scu-card.c +++ b/sound/soc/generic/simple-scu-card.c @@ -157,10 +157,17 @@ static int asoc_simple_card_dai_link_of(struct device_node *np, 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 "prefix"); + /* check "prefix" from each node if top doesn't have */ + if (!priv->codec_conf.of_node) + snd_soc_of_parse_node_prefix(np, + &priv->codec_conf, + dai_link->codecs->of_node, + "prefix"); } ret = asoc_simple_card_of_parse_tdm(np, &dai_props->dai);