From patchwork Wed May 17 09:52:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 104364 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp150796qge; Wed, 17 May 2017 02:55:20 -0700 (PDT) X-Received: by 10.223.166.129 with SMTP id t1mr1889028wrc.116.1495014920525; Wed, 17 May 2017 02:55:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495014920; cv=none; d=google.com; s=arc-20160816; b=nkuUWG3QLQV/J9JonuX4KID113N47obDNlrv1vHCsQN7/H1N8BPrhUsvacbMkToTH2 9NARyRb6SaSYu+siZ9YAfB1jaVU4Z4XNioqi448NLxGBimCcX6hju8Q+T4dR/ScyNpU3 Dn1fWTDhK1xFiD54gRiCM0muEnF7bSVMvIG24/3dEQLfy0+ylYVcP8A+Gst3tgvXUrQ2 qdczHRf4HvhpMn//onCpGhnav0A6A0A/V09VIKY0NY4icaEWybBURBKwSMx8tQ49BQxm Il0WWHScJfXGsQT1MzzeIDcWD9zAXbN/hBobn4UCVWl5MuYbGW5Wc7p1Snlw+AGr1MEj 4y7w== 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=G8KxVV/pOSgHNiKuMkjHmuokL4Goy6ek8gAmCxY/PIY=; b=ncCYb5l/aMWtTgxec3ygeZDOLggzgLm1pxhiZDZoQkSfsAJE+17PbDOM1geUjYpq7G HlPRRitb8oHIMp5+4186PvL6o9BiVexB+3S5EdsqIZiqOw0Nqs369ZMbLBh+8+hlxTmc /NGDhhU9OzV+FZOaPyDdR95Ju3i2Lb7bGIIcCJfufLvd0b45Dmerd6DGWb0pNPcYVRA1 AwOjksCwZNtIqE17nvO8le4vs4/puOPRkVBDoSWOczp9Sm6IXdVf62atsdngFEb9wc6O Cng7PDm2i4QWVZNoJgIIt2FkNAzc5i0tKIHbba797sjL/H021FniRVEE9W8Z0tXR81nz Auaw== 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 p14si17312130wmi.47.2017.05.17.02.55.20; Wed, 17 May 2017 02:55:20 -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 878572675E8; Wed, 17 May 2017 11:54:10 +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 F35AF2675E4; Wed, 17 May 2017 11:54:07 +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=HEADER_FROM_DIFFERENT_DOMAINS, RP_MATCHES_RCVD, SPF_PASS, URIBL_BLOCKED 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 02BCF2670EC for ; Wed, 17 May 2017 11:52:53 +0200 (CEST) Received: from [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.84_2) (envelope-from ) id 1dAvdK-0002Ye-MP; Wed, 17 May 2017 09:52:45 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1dAvdG-0006ut-Tt; Wed, 17 May 2017 10:52:38 +0100 From: Mark Brown To: Kuninori Morimoto In-Reply-To: <874lxbsyaz.wl%kuninori.morimoto.gx@renesas.com> Message-Id: Date: Wed, 17 May 2017 10:52:38 +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 Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: No (on mezzanine.sirena.org.uk); Unknown failure Cc: Linux-Renesas , alsa-devel@alsa-project.org, Mark Brown , Geert Uytterhoeven , Simon Subject: [alsa-devel] Applied "ASoC: rsnd: move "renesas, rsrc-card" to "simple-scu-audio-card" on Document" 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: rsnd: move "renesas,rsrc-card" to "simple-scu-audio-card" on Document 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 0378bb966765e06fdb0e00d592a6fcfbb71afa3c Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Wed, 26 Apr 2017 02:26:30 +0000 Subject: [PATCH] ASoC: rsnd: move "renesas,rsrc-card" to "simple-scu-audio-card" on Document "renesas,rsrc-card" is exchanged to "simple-scu-card". Let's update Document Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- .../devicetree/bindings/sound/renesas,rsnd.txt | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) -- 2.11.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt index 15a7316e4c91..3332910a9a11 100644 --- a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt +++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt @@ -83,11 +83,11 @@ SRC can convert [xx]Hz to [yy]Hz. Then, it has below 2 modes ** Asynchronous mode ------------------ -You need to use "renesas,rsrc-card" sound card for it. +You need to use "simple-scu-audio-card" sound card for it. example) sound { - compatible = "renesas,rsrc-card"; + compatible = "simple-scu-audio-card"; ... /* * SRC Asynchronous mode setting @@ -97,12 +97,12 @@ example) * Inputed 48kHz data will be converted to * system specified Hz */ - convert-rate = <48000>; + simple-audio-card,convert-rate = <48000>; ... - cpu { + simple-audio-card,cpu { sound-dai = <&rcar_sound>; }; - codec { + simple-audio-card,codec { ... }; }; @@ -141,23 +141,23 @@ For more detail information, see below ${LINUX}/sound/soc/sh/rcar/ctu.c - comment of header -You need to use "renesas,rsrc-card" sound card for it. +You need to use "simple-scu-audio-card" sound card for it. example) sound { - compatible = "renesas,rsrc-card"; + compatible = "simple-scu-audio-card"; ... /* * CTU setting * All input data will be converted to 2ch * as output data */ - convert-channels = <2>; + simple-audio-card,convert-channels = <2>; ... - cpu { + simple-audio-card,cpu { sound-dai = <&rcar_sound>; }; - codec { + simple-audio-card,codec { ... }; }; @@ -190,22 +190,22 @@ and these sounds will be merged by MIX. aplay -D plughw:0,0 xxxx.wav & aplay -D plughw:0,1 yyyy.wav -You need to use "renesas,rsrc-card" sound card for it. +You need to use "simple-scu-audio-card" sound card for it. Ex) [MEM] -> [SRC1] -> [CTU02] -+-> [MIX0] -> [DVC0] -> [SSI0] | [MEM] -> [SRC2] -> [CTU03] -+ sound { - compatible = "renesas,rsrc-card"; + compatible = "simple-scu-audio-card"; ... - cpu@0 { + simple-audio-card,cpu@0 { sound-dai = <&rcar_sound 0>; }; - cpu@1 { + simple-audio-card,cpu@1 { sound-dai = <&rcar_sound 1>; }; - codec { + simple-audio-card,codec { ... }; };