From patchwork Wed Oct 25 02:18:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 738358 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 48704C25B48 for ; Wed, 25 Oct 2023 02:23:32 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 0ED8D852; Wed, 25 Oct 2023 04:22:40 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0ED8D852 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1698200610; bh=JIftVMUTHyucbnO76pE0xCJuHGyFH8buKqCmRIpjtdI=; h=From:Subject:To:Cc:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=I5OLaeceq1dcUOdASD0cbzKhQG+ZrAriy4PxuCYeH/vZdDXVRRcqI+UdhUHq2QqfZ /bIFrSBt7bNNN07eS8g/TIE8McWotjXlyI+kORuqb0UbrEc8qd9CwaLKt/0ZiVbqUm Zlk2DC1nlHJgEKoA5mRFLMYJu54ShUABXwTjmhgg= Received: by alsa1.perex.cz (Postfix, from userid 50401) id D8445F80567; Wed, 25 Oct 2023 04:21:49 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 39BD4F8055C; Wed, 25 Oct 2023 04:21:49 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 67907F8055C; Wed, 25 Oct 2023 04:19:06 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on20714.outbound.protection.outlook.com [IPv6:2a01:111:f403:700c::714]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 05E7EF8055A for ; Wed, 25 Oct 2023 04:18:52 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 05E7EF8055A Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=lxh1A0jn ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JimeMEdX1HmzWNS1Y6qMPSJ1dLsj98pgsdSZtCEK7tPdjg3h7CgPqeB3gka4LJmEYAAm6+3nBEM48AFoqBp5gJhiomSQYE1WIV6opH8CAVs4qRHsgJpxEpJR3vCzxPNK1NTJW44n+pUPWOcbG5s/BlUpQbSS0idjqSCOjV9NoNF+AvYPDuEDwTI1bb/5hdmb+E82XJqlzFiymsWkKSBIfWttHZzSZtDJ/6gHc3o92sGAkOXJ3CabnuPB9hARSiGx83HzVwAmzO0YZsdPdXoI2nHpLUE9WR4BpvI8xiieNvZSvHkP6tKXW5AnhkzlJu/mudvY/kDLn5ICSybmQuRGOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=AM7EnB83jtlSKLAmJEJGQftdO29zDX7nmWMdLsNRMT8=; b=T9wqID10B2N798RHRtiTxCeaGsvqixnGjQHxFAbeTrl5R7hbJNNJ8f5uw8Z0C/yGTuKMDB0v5UeqMpwH44OabIuCHso1KprDkxlVOvjf8Xrcs6+D05zN8EO5cfgUVompQ7xbCPQQSoGxTKG48P6cbiu1RhnWHaOwT2njCAnxdtCepJUK+DQtkYwdGD9g/yHQbucPu0766qDfUQpPno1hNLrSzcFFSnN8YFoCYHVlYM/zmGS89OKaTOVIcriKI+m+ogxTXYmwecMtpoxUbXoSDIc9IuXRJVojEPQ6SGr02fjfH/ldvvXWE4wECMNCpkX16aP6SUkjMyCS6chrnWkygw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AM7EnB83jtlSKLAmJEJGQftdO29zDX7nmWMdLsNRMT8=; b=lxh1A0jnvt2FdTUwLoJFvaLtHQXSEzWvATCVNaZq6nUqwifnZg45BZkqUpelNfahFyGwWZJHpfT2JuVC0gCJZFOUt7dhtG6SnenEho9NLdai48ypWTuQ19TegD+N3e/h69uOOJvwFPXn7t/RGOuzt4jtGhMNpaRS3a83tnzbUaM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OS3PR01MB10372.jpnprd01.prod.outlook.com (2603:1096:604:1f9::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.31; Wed, 25 Oct 2023 02:18:50 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::f7e9:e682:d78b:f55a]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::f7e9:e682:d78b:f55a%3]) with mapi id 15.20.6933.019; Wed, 25 Oct 2023 02:18:50 +0000 Message-ID: <87bkcnbg1h.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v6 3/5] ASoC: audio-graph-card2-custom-sample: tidyup comment / numbering User-Agent: Wanderlust/2.15.9 Emacs/27.1 Mule/6.0 To: Pierre-Louis Bossart , Mark Brown , Bard Liao , bard.liao@intel.com, Conor Dooley , Krzysztof Kozlowski , Rob Herring , Jerome Brunet Cc: alsa-devel@alsa-project.org, devicetree@vger.kernel.org In-Reply-To: <87fs1zbg2g.wl-kuninori.morimoto.gx@renesas.com> References: <87fs1zbg2g.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 25 Oct 2023 02:18:50 +0000 X-ClientProxiedBy: TYWP286CA0019.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:262::6) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3PR01MB8426:EE_|OS3PR01MB10372:EE_ X-MS-Office365-Filtering-Correlation-Id: 0b1a4d9b-7ec7-478e-1e01-08dbd500ba42 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CuggJCVDCdF2DCbo2TMDd316QQvGKOvsiufbHw6TabRg/xoZ/oFfUTuTWf7xX4bElR92MKEp3vRDvcAu5hlNoFKrAbsGphBtXMDzNB6e+EYaXtLHWV0M1pojT7z4BjE+Ddy0knBDxMMUm+7Z5WhcQx2Y4AvwCD7GvlIy3ZjM3U9WDSDnRWPFn7DQA93HmkWnaKYzWth9/SfIsL+h69U1Ct1yrQON+06NcuNPYmTh2Tz9dZffjAJTXS+66Q/O9tpmHcrS0uvZ6s2cm34SzMQ6aLBMOqvkCFaUTY/mhy7lyEFv6CDLZZBUX9t+fLusd6C2uxWYSqBEGySWexHFjKmunfVbAYfa9g44MK1EiaoXluOx3xkbvSci6oFZQj5sQvsz+4SIE3Vo+pzDCusgyif0JGCDB48k9vRQhDn6Xhsx5w1QRVcF6E6WttyFc673cuabXFQ/J6k5OXVHRrzjClONgUYgOo18mAVY7kCRHR+B3nusF8IIDHhgHujJ51eeMga5K5wP96fxqYc/FWSdWngAqLjYccdlyiRN4aLaSd4ctSJguD1nDE3OsIhYalfofxTW7zyheP++nJFGeG8KXlefi4vme99m0MNz27n/Kd7i3PwQxDnMwvNEvRhs17vB+vdzPkknOMojpTlN0WZKaI/o/Q== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(366004)(376002)(39860400002)(396003)(346002)(136003)(230922051799003)(1800799009)(186009)(451199024)(64100799003)(38350700005)(2616005)(41300700001)(6506007)(52116002)(83380400001)(6512007)(7416002)(66556008)(26005)(4326008)(8936002)(8676002)(6486002)(2906002)(5660300002)(66946007)(478600001)(66476007)(110136005)(2013699003)(316002)(86362001)(38100700002)(36756003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: I/7wXwHcOp1fNZV8SazgVbSSW1oESY4Ng+dx2mJsPXNrFF7BAC4yDvxo0BDnLRzKqSQvEHuok/D0Vwy/AvNp9tGh+A3d/1cp+W+3a2FirLVuOyBCkgNh683ID6iDnRbg0Yr5FLZHqU0N2cmrgXKMy7s8k3Ot8zQVkA+uNjZITdhW8hf/HdpHrxbgUkWnvV9WcpT4SEqYvgMBHs0BT4Tmu6RNFhj878guhqLEUb0lYxlZEU3B9lDIr7YQgcEOsX6dkokzqeF/rzXW696UJOXqCGklovDusy3Bgcp3wFvJiQKofskZ7WF9UirvqwFriH6ZkK1gFhSy0qHHXybsNFDyl/u1G+yhIJN2bJ1dsv8ZRVWoQ/GGHJTUzLnFphFce/MdEbJsmgIE5cFuQ2Kea3P7cvnoWWeM2IWC+UDRHsWB9Kbi1L1DTl2Gqp5GSDZrvzNsAdLuq2M67bomGPH+GxjjH1Se/vP4oBze+qhrVvioIY8qwf+KraJ4xzfA57DiIpuonzw1YN3BI/dpVRAdJZlGhadhmbGmElDTM6411WnWVQ+b9N6gdp2BwJTllegTY/rZQWd5kuhjqicobnnLSCsyZtbHTrkvjwKyHRUtya+3ebFDkqKhjpraRMnijFTaIkd3yZwEqBn4TwkkZX/rANqtNaVMtHdJ5lURId7cgPdDmFunqe5YWWOvmpPM3nHZTc9+wp+D72wElTtrAaDvUpeRTJ8jXQ8yh49HsqbaAbMERnC44Isd5uZPXKLIKvPsZQOW+d3pLEjWo9T8bMV9n/PXbk1dutNxCzRLkl3ucKWIOA2qekZlJs0eWA0ouhe+6H5dok/SUdPHoQjoYlDQ7ihXa5wfjzknKw/UTrV3cI+4ogQa5w2t3KuZXAJjSVfmK0ha1RQOWQqLySNyDkI8K3sSTfA5vvrhmBh63UypibZnJmeww53Be6k0Im+NArQhTb603RHB+6+dJCVTwcpJz7RwyxwRnqxqmLxTG/5MhU5CKzuIW9EPcE77gF6nXLp+5D7DloKxr1uxBk1GeuPGP2Drarno2GwpAutHGvxwSb064SUNrpTn5tC+PNPq3FZR1kgtrY5JPCkn+KTOpTKIUFWSM8lSnhMrGfvEhT0rxoGT1DqhYbM6OWpJ7snneqG8K5U+RFRJoTIKkp8MVuqil9DJb4g9xvnfC2rNvFunI7ySBEm4uDU3FnUHbLKIZxIB+8+4l9dRpM0v/mduIC9N0Pk8rhUhoZOR00/8DosrfdrAZeR8fVI8WD+7Qi+lWC3eJChCmaG9lFS+9Odvw5GyKefTio5/A+3CiLI1PruCalAZwRaSfCXYGIhcHbhPGfXuWDAN868p182F4Q2cEl8RXx9/QpCi+hdx+fMH31DbyNMjvaX1EEUvyFCqD92T33TjXYW37YirAhekxFZ1tr3qt4vRiGdQUKb68yPJJUS3AZKTZOhzZt56LRI356WNJ8ZPo+71oto+pU8UbjQeJ+NbIe5ilzgXkIsqWMfhcTU+/owEnI2jwJApVQPVp/EAMldpkQiBLyAyfE6g79NDmhpG9+1QvKZKQRfI1FVp/7nXUxApZr8xSLANjGQUa9lqk4mN3aZXid7gxcVxDFFskatJ3fL6EGuo8dMMQXhyIQ9OTxY7inQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0b1a4d9b-7ec7-478e-1e01-08dbd500ba42 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2023 02:18:50.6638 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: DdTO0qCaskmVy0Mox1/r0nkVT1He5R4ymL+EYER2BM24OkR0pnVKV35p/tSkhqJxUmARkl57c8uhnU2MChNGulXVo+7JtWvLOfTuJY0eMPfsO0oTTRlQnZPHRqvIXPNt X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB10372 Message-ID-Hash: E36K6YADICSUYQXT7FHKDWQGGP52YZGS X-Message-ID-Hash: E36K6YADICSUYQXT7FHKDWQGGP52YZGS X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Some comment doesn't match other styles, this patch tidyup it. To prepare Multi CPU/Codec, this patch fixup some CPU/Codec numbering. Signed-off-by: Kuninori Morimoto --- .../audio-graph-card2-custom-sample.dtsi | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/sound/soc/generic/audio-graph-card2-custom-sample.dtsi b/sound/soc/generic/audio-graph-card2-custom-sample.dtsi index 8acaa2ddb335..736eca553d7c 100644 --- a/sound/soc/generic/audio-graph-card2-custom-sample.dtsi +++ b/sound/soc/generic/audio-graph-card2-custom-sample.dtsi @@ -58,7 +58,7 @@ / { * | |-> codec13 * +-+ * - * [Multi-CPU/Codec] + * [Multi-CPU/Codec-0] * +-+ +-+ * cpu1 <--| |<-@--------->| |-> codec1 * cpu2 <--| | | |-> codec2 @@ -144,11 +144,14 @@ audio-graph-card2-custom-sample { */ &cpu0 - /* [Semi-Multi] */ + /* + * [Semi-Multi] + * cpu7/codec12/codec13 + */ &sm0 /* - * [Multi-CPU/Codec]: cpu side only + * [Multi-CPU/Codec-0]: cpu side only * cpu1/cpu2/codec1/codec2 */ &mcpu0 @@ -182,24 +185,24 @@ multi { #address-cells = <1>; #size-cells = <0>; + /* [Multi-CPU-0] */ ports@0 { reg = <0>; #address-cells = <1>; #size-cells = <0>; - /* [Multi-CPU] */ - mcpu0: port@0 { reg = <0>; mcpu0_ep: endpoint { remote-endpoint = <&mcodec0_ep>; }; }; - port@1 { reg = <1>; mcpu1_ep: endpoint { remote-endpoint = <&cpu1_ep>; }; }; - port@2 { reg = <2>; mcpu2_ep: endpoint { remote-endpoint = <&cpu2_ep>; }; }; + mcpu0: port@0 { reg = <0>; mcpu00_ep: endpoint { remote-endpoint = <&mcodec00_ep>; }; }; + port@1 { reg = <1>; mcpu01_ep: endpoint { remote-endpoint = <&cpu1_ep>; }; }; + port@2 { reg = <2>; mcpu02_ep: endpoint { remote-endpoint = <&cpu2_ep>; }; }; }; - /* [Multi-Codec] */ + /* [Multi-Codec-0] */ ports@1 { reg = <1>; #address-cells = <1>; #size-cells = <0>; - port@0 { reg = <0>; mcodec0_ep: endpoint { remote-endpoint = <&mcpu0_ep>; }; }; - port@1 { reg = <1>; mcodec1_ep: endpoint { remote-endpoint = <&codec1_ep>; }; }; - port@2 { reg = <2>; mcodec2_ep: endpoint { remote-endpoint = <&codec2_ep>; }; }; + port@0 { reg = <0>; mcodec00_ep: endpoint { remote-endpoint = <&mcpu00_ep>; }; }; + port@1 { reg = <1>; mcodec01_ep: endpoint { remote-endpoint = <&codec1_ep>; }; }; + port@2 { reg = <2>; mcodec02_ep: endpoint { remote-endpoint = <&codec2_ep>; }; }; }; /* [DPCM-Multi]::BE */ @@ -323,9 +326,9 @@ ports { /* [Normal] */ cpu0: port@0 { reg = <0>; cpu0_ep: endpoint { remote-endpoint = <&codec0_ep>; }; }; - /* [Multi-CPU] */ - port@1 { reg = <1>; cpu1_ep: endpoint { remote-endpoint = <&mcpu1_ep>; }; }; - port@2 { reg = <2>; cpu2_ep: endpoint { remote-endpoint = <&mcpu2_ep>; }; }; + /* [Multi-CPU-0] */ + port@1 { reg = <1>; cpu1_ep: endpoint { remote-endpoint = <&mcpu01_ep>; }; }; + port@2 { reg = <2>; cpu2_ep: endpoint { remote-endpoint = <&mcpu02_ep>; }; }; /* [DPCM]::FE */ port@3 { reg = <3>; cpu3_ep: endpoint { remote-endpoint = <&fe00_ep>; }; }; @@ -363,9 +366,9 @@ ports { /* [Normal] */ port@0 { reg = <0>; codec0_ep: endpoint { remote-endpoint = <&cpu0_ep>; }; }; - /* [Multi-Codec] */ - port@1 { reg = <1>; codec1_ep: endpoint { remote-endpoint = <&mcodec1_ep>; }; }; - port@2 { reg = <2>; codec2_ep: endpoint { remote-endpoint = <&mcodec2_ep>; }; }; + /* [Multi-Codec-0] */ + port@1 { reg = <1>; codec1_ep: endpoint { remote-endpoint = <&mcodec01_ep>; }; }; + port@2 { reg = <2>; codec2_ep: endpoint { remote-endpoint = <&mcodec02_ep>; }; }; /* [DPCM]::BE */ port@3 {