From patchwork Wed Oct 3 08:58:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Jiada" X-Patchwork-Id: 10624425 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5A6BC17E0 for ; Wed, 3 Oct 2018 08:59:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 491742864B for ; Wed, 3 Oct 2018 08:59:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D005286A2; Wed, 3 Oct 2018 08:59:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F27B28691 for ; Wed, 3 Oct 2018 08:59:23 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 48EAB267845; Wed, 3 Oct 2018 10:59:16 +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 63783267772; Wed, 3 Oct 2018 10:59:12 +0200 (CEST) Received: from relay1.mentorg.com (relay1.mentorg.com [192.94.38.131]) by alsa0.perex.cz (Postfix) with ESMTP id 0114F267736 for ; Wed, 3 Oct 2018 10:59:07 +0200 (CEST) Received: from svr-orw-mbx-03.mgc.mentorg.com ([147.34.90.203]) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1g7czr-00027w-1U from Jiada_Wang@mentor.com ; Wed, 03 Oct 2018 01:59:07 -0700 Received: from jiwang-OptiPlex-980.tokyo.mentorg.com (147.34.91.1) by svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Wed, 3 Oct 2018 01:59:03 -0700 From: To: , , , , Date: Wed, 3 Oct 2018 17:58:47 +0900 Message-ID: <20181003085855.4305-2-jiada_wang@mentor.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20181003085855.4305-1-jiada_wang@mentor.com> References: <20181003085855.4305-1-jiada_wang@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: svr-orw-mbx-08.mgc.mentorg.com (147.34.90.208) To svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [alsa-devel] [PATCH linux-next v2 1/9] arm64: r8a7795: add dma request number for busif0 ~ busif7 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jiada Wang This patch adds dma request number for busif0 ~ busif7 to be used by GEN3 series. GEN2 continues to use rxu/txu for busif data transfer. Signed-off-by: Jiada Wang --- arch/arm64/boot/dts/renesas/r8a7795.dtsi | 164 ++++++++++++++++++++--- 1 file changed, 144 insertions(+), 20 deletions(-) diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi index b5f2273caca4..fc6100eddfed 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi @@ -1923,53 +1923,177 @@ rcar_sound,ssi { ssi0: ssi-0 { interrupts = ; - dmas = <&audma0 0x01>, <&audma1 0x02>, <&audma0 0x15>, <&audma1 0x16>; - dma-names = "rx", "tx", "rxu", "txu"; + dmas = <&audma0 0x01>, <&audma1 0x02>, + <&audma0 0x15>, <&audma1 0x16>, + <&audma0 0x15>, <&audma1 0x16>, + <&audma0 0x35>, <&audma1 0x36>, + <&audma0 0x37>, <&audma1 0x38>, + <&audma0 0x47>, <&audma1 0x48>, + <&audma0 0x3f>, <&audma1 0x40>, + <&audma0 0x43>, <&audma1 0x44>, + <&audma0 0x4f>, <&audma1 0x50>, + <&audma0 0x53>, <&audma1 0x54>; + dma-names = "rx", "tx", + "rxu", "txu", + "rxu0", "txu0", + "rxu1", "txu1", + "rxu2", "txu2", + "rxu3", "txu3", + "rxu4", "txu4", + "rxu5", "txu5", + "rxu6", "txu6", + "rxu7", "txu7"; }; ssi1: ssi-1 { interrupts = ; - dmas = <&audma0 0x03>, <&audma1 0x04>, <&audma0 0x49>, <&audma1 0x4a>; - dma-names = "rx", "tx", "rxu", "txu"; + dmas = <&audma0 0x03>, <&audma1 0x04>, + <&audma0 0x49>, <&audma1 0x4a>, + <&audma0 0x49>, <&audma1 0x4a>, + <&audma0 0x4b>, <&audma1 0x4c>, + <&audma0 0x57>, <&audma1 0x58>, + <&audma0 0x59>, <&audma1 0x5a>, + <&audma0 0x5f>, <&audma1 0x60>, + <&audma0 0xc3>, <&audma1 0xc4>, + <&audma0 0xc7>, <&audma1 0xc8>, + <&audma0 0xcb>, <&audma1 0xcc>; + dma-names = "rx", "tx", + "rxu", "txu", + "rxu0", "txu0", + "rxu1", "txu1", + "rxu2", "txu2", + "rxu3", "txu3", + "rxu4", "txu4", + "rxu5", "txu5", + "rxu6", "txu6", + "rxu7", "txu7"; }; ssi2: ssi-2 { interrupts = ; - dmas = <&audma0 0x05>, <&audma1 0x06>, <&audma0 0x63>, <&audma1 0x64>; - dma-names = "rx", "tx", "rxu", "txu"; + dmas = <&audma0 0x05>, <&audma1 0x06>, + <&audma0 0x63>, <&audma1 0x64>, + <&audma0 0x63>, <&audma1 0x64>, + <&audma0 0x67>, <&audma1 0x68>, + <&audma0 0x6b>, <&audma1 0x6c>, + <&audma0 0x6d>, <&audma1 0x6e>, + <&audma0 0xcf>, <&audma1 0xce>, + <&audma0 0xeb>, <&audma1 0xec>, + <&audma0 0xed>, <&audma1 0xee>, + <&audma0 0xef>, <&audma1 0xf0>; + dma-names = "rx", "tx", + "rxu", "txu", + "rxu0", "txu0", + "rxu1", "txu1", + "rxu2", "txu2", + "rxu3", "txu3", + "rxu4", "txu4", + "rxu5", "txu5", + "rxu6", "txu6", + "rxu7", "txu7"; }; ssi3: ssi-3 { interrupts = ; - dmas = <&audma0 0x07>, <&audma1 0x08>, <&audma0 0x6f>, <&audma1 0x70>; - dma-names = "rx", "tx", "rxu", "txu"; + dmas = <&audma0 0x07>, <&audma1 0x08>, + <&audma0 0x6f>, <&audma1 0x70>, + <&audma0 0x6f>, <&audma1 0x70>, + <&audma0 0x21>, <&audma1 0x22>, + <&audma0 0x23>, <&audma1 0x24>, + <&audma0 0x25>, <&audma1 0x26>, + <&audma0 0x27>, <&audma1 0x28>, + <&audma0 0x29>, <&audma1 0x2a>, + <&audma0 0x2b>, <&audma1 0x2c>, + <&audma0 0x2d>, <&audma1 0x2e>; + dma-names = "rx", "tx", + "rxu", "txu", + "rxu0", "txu0", + "rxu1", "txu1", + "rxu2", "txu2", + "rxu3", "txu3", + "rxu4", "txu4", + "rxu5", "txu5", + "rxu6", "txu6", + "rxu7", "txu7"; }; ssi4: ssi-4 { interrupts = ; - dmas = <&audma0 0x09>, <&audma1 0x0a>, <&audma0 0x71>, <&audma1 0x72>; - dma-names = "rx", "tx", "rxu", "txu"; + dmas = <&audma0 0x09>, <&audma1 0x0a>, + <&audma0 0x71>, <&audma1 0x72>, + <&audma0 0x71>, <&audma1 0x72>, + <&audma0 0x17>, <&audma1 0x18>, + <&audma0 0x19>, <&audma1 0x1a>, + <&audma0 0x1b>, <&audma1 0x1c>, + <&audma0 0x1d>, <&audma1 0x1e>, + <&audma0 0x1f>, <&audma1 0x20>, + <&audma0 0x31>, <&audma1 0x32>, + <&audma0 0x33>, <&audma1 0x34>; + dma-names = "rx", "tx", + "rxu", "txu", + "rxu0", "txu0", + "rxu1", "txu1", + "rxu2", "txu2", + "rxu3", "txu3", + "rxu4", "txu4", + "rxu5", "txu5", + "rxu6", "txu6", + "rxu7", "txu7"; }; ssi5: ssi-5 { interrupts = ; - dmas = <&audma0 0x0b>, <&audma1 0x0c>, <&audma0 0x73>, <&audma1 0x74>; - dma-names = "rx", "tx", "rxu", "txu"; + dmas = <&audma0 0x0b>, <&audma1 0x0c>, + <&audma0 0x73>, <&audma1 0x74>, + <&audma0 0x73>, <&audma1 0x74>; + dma-names = "rx", "tx", + "rxu", "txu", + "rxu0", "txu0"; }; ssi6: ssi-6 { interrupts = ; - dmas = <&audma0 0x0d>, <&audma1 0x0e>, <&audma0 0x75>, <&audma1 0x76>; - dma-names = "rx", "tx", "rxu", "txu"; + dmas = <&audma0 0x0d>, <&audma1 0x0e>, + <&audma0 0x75>, <&audma1 0x76>, + <&audma0 0x75>, <&audma1 0x76>; + dma-names = "rx", "tx", + "rxu", "txu", + "rxu0", "txu0"; }; ssi7: ssi-7 { interrupts = ; - dmas = <&audma0 0x0f>, <&audma1 0x10>, <&audma0 0x79>, <&audma1 0x7a>; - dma-names = "rx", "tx", "rxu", "txu"; + dmas = <&audma0 0x0f>, <&audma1 0x10>, + <&audma0 0x79>, <&audma1 0x7a>, + <&audma0 0x79>, <&audma1 0x7a>; + dma-names = "rx", "tx", + "rxu", "txu", + "rxu0", "txu0"; }; ssi8: ssi-8 { interrupts = ; - dmas = <&audma0 0x11>, <&audma1 0x12>, <&audma0 0x7b>, <&audma1 0x7c>; - dma-names = "rx", "tx", "rxu", "txu"; + dmas = <&audma0 0x11>, <&audma1 0x12>, + <&audma0 0x7b>, <&audma1 0x7c>, + <&audma0 0x7b>, <&audma1 0x7c>; + dma-names = "rx", "tx", + "rxu", "txu", + "rxu0", "txu0"; }; ssi9: ssi-9 { interrupts = ; - dmas = <&audma0 0x13>, <&audma1 0x14>, <&audma0 0x7d>, <&audma1 0x7e>; - dma-names = "rx", "tx", "rxu", "txu"; + dmas = <&audma0 0x13>, <&audma1 0x14>, + <&audma0 0x7d>, <&audma1 0x7e>, + <&audma0 0x7d>, <&audma1 0x7e>, + <&audma0 0x7f>, <&audma1 0x80>, + <&audma0 0x81>, <&audma1 0x82>, + <&audma0 0x83>, <&audma1 0x84>, + <&audma0 0xa3>, <&audma1 0xa4>, + <&audma0 0xa5>, <&audma1 0xa6>, + <&audma0 0xa7>, <&audma1 0xa8>, + <&audma0 0xa9>, <&audma1 0xaa>; + dma-names = "rx", "tx", + "rxu", "txu", + "rxu0", "txu0", + "rxu1", "txu1", + "rxu2", "txu2", + "rxu3", "txu3", + "rxu4", "txu4", + "rxu5", "txu5", + "rxu6", "txu6", + "rxu7", "txu7"; }; }; From patchwork Wed Oct 3 08:58:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Jiada" X-Patchwork-Id: 10624427 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BEDF813BB for ; Wed, 3 Oct 2018 08:59:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC61F2864B for ; Wed, 3 Oct 2018 08:59:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A0C8C286A2; Wed, 3 Oct 2018 08:59:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C61912864B for ; Wed, 3 Oct 2018 08:59:31 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id CD3922678B0; Wed, 3 Oct 2018 10:59:17 +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 D4C99267772; Wed, 3 Oct 2018 10:59:13 +0200 (CEST) Received: from relay1.mentorg.com (relay1.mentorg.com [192.94.38.131]) by alsa0.perex.cz (Postfix) with ESMTP id 781C32676A7 for ; Wed, 3 Oct 2018 10:59:11 +0200 (CEST) Received: from svr-orw-mbx-03.mgc.mentorg.com ([147.34.90.203]) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1g7czu-00028D-H4 from Jiada_Wang@mentor.com ; Wed, 03 Oct 2018 01:59:10 -0700 Received: from jiwang-OptiPlex-980.tokyo.mentorg.com (147.34.91.1) by svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Wed, 3 Oct 2018 01:59:07 -0700 From: To: , , , , Date: Wed, 3 Oct 2018 17:58:48 +0900 Message-ID: <20181003085855.4305-3-jiada_wang@mentor.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20181003085855.4305-1-jiada_wang@mentor.com> References: <20181003085855.4305-1-jiada_wang@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: svr-orw-mbx-08.mgc.mentorg.com (147.34.90.208) To svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [alsa-devel] [PATCH linux-next v2 2/9] arm64: r8a7796: add dma request number for busif0 ~ busif7 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jiada Wang This patch adds dma request number for busif0 ~ busif7 to be used by GEN3 series. GEN2 continues to use rxu/txu for busif data transfer. Signed-off-by: Jiada Wang --- arch/arm64/boot/dts/renesas/r8a7796.dtsi | 164 ++++++++++++++++++++--- 1 file changed, 144 insertions(+), 20 deletions(-) diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi index 1ec6aaa520c1..53b361c5b16d 100644 --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi @@ -1797,53 +1797,177 @@ rcar_sound,ssi { ssi0: ssi-0 { interrupts = ; - dmas = <&audma0 0x01>, <&audma1 0x02>, <&audma0 0x15>, <&audma1 0x16>; - dma-names = "rx", "tx", "rxu", "txu"; + dmas = <&audma0 0x01>, <&audma1 0x02>, + <&audma0 0x15>, <&audma1 0x16>, + <&audma0 0x15>, <&audma1 0x16>, + <&audma0 0x35>, <&audma1 0x36>, + <&audma0 0x37>, <&audma1 0x38>, + <&audma0 0x47>, <&audma1 0x48>, + <&audma0 0x3f>, <&audma1 0x40>, + <&audma0 0x43>, <&audma1 0x44>, + <&audma0 0x4f>, <&audma1 0x50>, + <&audma0 0x53>, <&audma1 0x54>; + dma-names = "rx", "tx", + "rxu", "txu", + "rxu0", "txu0", + "rxu1", "txu1", + "rxu2", "txu2", + "rxu3", "txu3", + "rxu4", "txu4", + "rxu5", "txu5", + "rxu6", "txu6", + "rxu7", "txu7"; }; ssi1: ssi-1 { interrupts = ; - dmas = <&audma0 0x03>, <&audma1 0x04>, <&audma0 0x49>, <&audma1 0x4a>; - dma-names = "rx", "tx", "rxu", "txu"; + dmas = <&audma0 0x03>, <&audma1 0x04>, + <&audma0 0x49>, <&audma1 0x4a>, + <&audma0 0x49>, <&audma1 0x4a>, + <&audma0 0x4b>, <&audma1 0x4c>, + <&audma0 0x57>, <&audma1 0x58>, + <&audma0 0x59>, <&audma1 0x5a>, + <&audma0 0x5f>, <&audma1 0x60>, + <&audma0 0xc3>, <&audma1 0xc4>, + <&audma0 0xc7>, <&audma1 0xc8>, + <&audma0 0xcb>, <&audma1 0xcc>; + dma-names = "rx", "tx", + "rxu", "txu", + "rxu0", "txu0", + "rxu1", "txu1", + "rxu2", "txu2", + "rxu3", "txu3", + "rxu4", "txu4", + "rxu5", "txu5", + "rxu6", "txu6", + "rxu7", "txu7"; }; ssi2: ssi-2 { interrupts = ; - dmas = <&audma0 0x05>, <&audma1 0x06>, <&audma0 0x63>, <&audma1 0x64>; - dma-names = "rx", "tx", "rxu", "txu"; + dmas = <&audma0 0x05>, <&audma1 0x06>, + <&audma0 0x63>, <&audma1 0x64>, + <&audma0 0x63>, <&audma1 0x64>, + <&audma0 0x67>, <&audma1 0x68>, + <&audma0 0x6b>, <&audma1 0x6c>, + <&audma0 0x6d>, <&audma1 0x6e>, + <&audma0 0xcf>, <&audma1 0xce>, + <&audma0 0xeb>, <&audma1 0xec>, + <&audma0 0xed>, <&audma1 0xee>, + <&audma0 0xef>, <&audma1 0xf0>; + dma-names = "rx", "tx", + "rxu", "txu", + "rxu0", "txu0", + "rxu1", "txu1", + "rxu2", "txu2", + "rxu3", "txu3", + "rxu4", "txu4", + "rxu5", "txu5", + "rxu6", "txu6", + "rxu7", "txu7"; }; ssi3: ssi-3 { interrupts = ; - dmas = <&audma0 0x07>, <&audma1 0x08>, <&audma0 0x6f>, <&audma1 0x70>; - dma-names = "rx", "tx", "rxu", "txu"; + dmas = <&audma0 0x07>, <&audma1 0x08>, + <&audma0 0x6f>, <&audma1 0x70>, + <&audma0 0x6f>, <&audma1 0x70>, + <&audma0 0x21>, <&audma1 0x22>, + <&audma0 0x23>, <&audma1 0x24>, + <&audma0 0x25>, <&audma1 0x26>, + <&audma0 0x27>, <&audma1 0x28>, + <&audma0 0x29>, <&audma1 0x2a>, + <&audma0 0x2b>, <&audma1 0x2c>, + <&audma0 0x2d>, <&audma1 0x2e>; + dma-names = "rx", "tx", + "rxu", "txu", + "rxu0", "txu0", + "rxu1", "txu1", + "rxu2", "txu2", + "rxu3", "txu3", + "rxu4", "txu4", + "rxu5", "txu5", + "rxu6", "txu6", + "rxu7", "txu7"; }; ssi4: ssi-4 { interrupts = ; - dmas = <&audma0 0x09>, <&audma1 0x0a>, <&audma0 0x71>, <&audma1 0x72>; - dma-names = "rx", "tx", "rxu", "txu"; + dmas = <&audma0 0x09>, <&audma1 0x0a>, + <&audma0 0x71>, <&audma1 0x72>, + <&audma0 0x71>, <&audma1 0x72>, + <&audma0 0x17>, <&audma1 0x18>, + <&audma0 0x19>, <&audma1 0x1a>, + <&audma0 0x1b>, <&audma1 0x1c>, + <&audma0 0x1d>, <&audma1 0x1e>, + <&audma0 0x1f>, <&audma1 0x20>, + <&audma0 0x31>, <&audma1 0x32>, + <&audma0 0x33>, <&audma1 0x34>; + dma-names = "rx", "tx", + "rxu", "txu", + "rxu0", "txu0", + "rxu1", "txu1", + "rxu2", "txu2", + "rxu3", "txu3", + "rxu4", "txu4", + "rxu5", "txu5", + "rxu6", "txu6", + "rxu7", "txu7"; }; ssi5: ssi-5 { interrupts = ; - dmas = <&audma0 0x0b>, <&audma1 0x0c>, <&audma0 0x73>, <&audma1 0x74>; - dma-names = "rx", "tx", "rxu", "txu"; + dmas = <&audma0 0x0b>, <&audma1 0x0c>, + <&audma0 0x73>, <&audma1 0x74>, + <&audma0 0x73>, <&audma1 0x74>; + dma-names = "rx", "tx", + "rxu", "txu", + "rxu0", "txu0"; }; ssi6: ssi-6 { interrupts = ; - dmas = <&audma0 0x0d>, <&audma1 0x0e>, <&audma0 0x75>, <&audma1 0x76>; - dma-names = "rx", "tx", "rxu", "txu"; + dmas = <&audma0 0x0d>, <&audma1 0x0e>, + <&audma0 0x75>, <&audma1 0x76>, + <&audma0 0x75>, <&audma1 0x76>; + dma-names = "rx", "tx", + "rxu", "txu", + "rxu0", "txu0"; }; ssi7: ssi-7 { interrupts = ; - dmas = <&audma0 0x0f>, <&audma1 0x10>, <&audma0 0x79>, <&audma1 0x7a>; - dma-names = "rx", "tx", "rxu", "txu"; + dmas = <&audma0 0x0f>, <&audma1 0x10>, + <&audma0 0x79>, <&audma1 0x7a>, + <&audma0 0x79>, <&audma1 0x7a>; + dma-names = "rx", "tx", + "rxu", "txu", + "rxu0", "txu0"; }; ssi8: ssi-8 { interrupts = ; - dmas = <&audma0 0x11>, <&audma1 0x12>, <&audma0 0x7b>, <&audma1 0x7c>; - dma-names = "rx", "tx", "rxu", "txu"; + dmas = <&audma0 0x11>, <&audma1 0x12>, + <&audma0 0x7b>, <&audma1 0x7c>, + <&audma0 0x7b>, <&audma1 0x7c>; + dma-names = "rx", "tx", + "rxu", "txu", + "rxu0", "txu0"; }; ssi9: ssi-9 { interrupts = ; - dmas = <&audma0 0x13>, <&audma1 0x14>, <&audma0 0x7d>, <&audma1 0x7e>; - dma-names = "rx", "tx", "rxu", "txu"; + dmas = <&audma0 0x13>, <&audma1 0x14>, + <&audma0 0x7d>, <&audma1 0x7e>, + <&audma0 0x7d>, <&audma1 0x7e>, + <&audma0 0x7f>, <&audma1 0x80>, + <&audma0 0x81>, <&audma1 0x82>, + <&audma0 0x83>, <&audma1 0x84>, + <&audma0 0xa3>, <&audma1 0xa4>, + <&audma0 0xa5>, <&audma1 0xa6>, + <&audma0 0xa7>, <&audma1 0xa8>, + <&audma0 0xa9>, <&audma1 0xaa>; + dma-names = "rx", "tx", + "rxu", "txu", + "rxu0", "txu0", + "rxu1", "txu1", + "rxu2", "txu2", + "rxu3", "txu3", + "rxu4", "txu4", + "rxu5", "txu5", + "rxu6", "txu6", + "rxu7", "txu7"; }; }; From patchwork Wed Oct 3 08:58:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Jiada" X-Patchwork-Id: 10624429 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D8530175A for ; Wed, 3 Oct 2018 08:59:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C8379285ED for ; Wed, 3 Oct 2018 08:59:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BB4832864B; Wed, 3 Oct 2018 08:59:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D57F6285FD for ; Wed, 3 Oct 2018 08:59:38 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 424FC2678D9; Wed, 3 Oct 2018 10:59:19 +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 15E782678BA; Wed, 3 Oct 2018 10:59:17 +0200 (CEST) Received: from relay1.mentorg.com (relay1.mentorg.com [192.94.38.131]) by alsa0.perex.cz (Postfix) with ESMTP id DE62426783D for ; Wed, 3 Oct 2018 10:59:14 +0200 (CEST) Received: from svr-orw-mbx-03.mgc.mentorg.com ([147.34.90.203]) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1g7czx-00029Z-UZ from Jiada_Wang@mentor.com ; Wed, 03 Oct 2018 01:59:13 -0700 Received: from jiwang-OptiPlex-980.tokyo.mentorg.com (147.34.91.1) by svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Wed, 3 Oct 2018 01:59:10 -0700 From: To: , , , , Date: Wed, 3 Oct 2018 17:58:49 +0900 Message-ID: <20181003085855.4305-4-jiada_wang@mentor.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20181003085855.4305-1-jiada_wang@mentor.com> References: <20181003085855.4305-1-jiada_wang@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: svr-orw-mbx-08.mgc.mentorg.com (147.34.90.208) To svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [alsa-devel] [PATCH linux-next v2 3/9] arm64: r8a774a1: add dma request number for busif0 ~ busif7 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jiada Wang This patch adds dma request number for busif0 ~ busif7 to be used by GEN3 series. GEN2 continues to use rxu/txu for busif data transfer. Signed-off-by: Jiada Wang --- arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 164 +++++++++++++++++++--- 1 file changed, 144 insertions(+), 20 deletions(-) diff --git a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi index 012cbb64246e..ad2c9c0148ae 100644 --- a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi @@ -1247,53 +1247,177 @@ rcar_sound,ssi { ssi0: ssi-0 { interrupts = ; - dmas = <&audma0 0x01>, <&audma1 0x02>, <&audma0 0x15>, <&audma1 0x16>; - dma-names = "rx", "tx", "rxu", "txu"; + dmas = <&audma0 0x01>, <&audma1 0x02>, + <&audma0 0x15>, <&audma1 0x16>, + <&audma0 0x15>, <&audma1 0x16>, + <&audma0 0x35>, <&audma1 0x36>, + <&audma0 0x37>, <&audma1 0x38>, + <&audma0 0x47>, <&audma1 0x48>, + <&audma0 0x3f>, <&audma1 0x40>, + <&audma0 0x43>, <&audma1 0x44>, + <&audma0 0x4f>, <&audma1 0x50>, + <&audma0 0x53>, <&audma1 0x54>; + dma-names = "rx", "tx", + "rxu", "txu", + "rxu0", "txu0", + "rxu1", "txu1", + "rxu2", "txu2", + "rxu3", "txu3", + "rxu4", "txu4", + "rxu5", "txu5", + "rxu6", "txu6", + "rxu7", "txu7"; }; ssi1: ssi-1 { interrupts = ; - dmas = <&audma0 0x03>, <&audma1 0x04>, <&audma0 0x49>, <&audma1 0x4a>; - dma-names = "rx", "tx", "rxu", "txu"; + dmas = <&audma0 0x03>, <&audma1 0x04>, + <&audma0 0x49>, <&audma1 0x4a>, + <&audma0 0x49>, <&audma1 0x4a>, + <&audma0 0x4b>, <&audma1 0x4c>, + <&audma0 0x57>, <&audma1 0x58>, + <&audma0 0x59>, <&audma1 0x5a>, + <&audma0 0x5f>, <&audma1 0x60>, + <&audma0 0xc3>, <&audma1 0xc4>, + <&audma0 0xc7>, <&audma1 0xc8>, + <&audma0 0xcb>, <&audma1 0xcc>; + dma-names = "rx", "tx", + "rxu", "txu", + "rxu0", "txu0", + "rxu1", "txu1", + "rxu2", "txu2", + "rxu3", "txu3", + "rxu4", "txu4", + "rxu5", "txu5", + "rxu6", "txu6", + "rxu7", "txu7"; }; ssi2: ssi-2 { interrupts = ; - dmas = <&audma0 0x05>, <&audma1 0x06>, <&audma0 0x63>, <&audma1 0x64>; - dma-names = "rx", "tx", "rxu", "txu"; + dmas = <&audma0 0x05>, <&audma1 0x06>, + <&audma0 0x63>, <&audma1 0x64>, + <&audma0 0x63>, <&audma1 0x64>, + <&audma0 0x67>, <&audma1 0x68>, + <&audma0 0x6b>, <&audma1 0x6c>, + <&audma0 0x6d>, <&audma1 0x6e>, + <&audma0 0xcf>, <&audma1 0xce>, + <&audma0 0xeb>, <&audma1 0xec>, + <&audma0 0xed>, <&audma1 0xee>, + <&audma0 0xef>, <&audma1 0xf0>; + dma-names = "rx", "tx", + "rxu", "txu", + "rxu0", "txu0", + "rxu1", "txu1", + "rxu2", "txu2", + "rxu3", "txu3", + "rxu4", "txu4", + "rxu5", "txu5", + "rxu6", "txu6", + "rxu7", "txu7"; }; ssi3: ssi-3 { interrupts = ; - dmas = <&audma0 0x07>, <&audma1 0x08>, <&audma0 0x6f>, <&audma1 0x70>; - dma-names = "rx", "tx", "rxu", "txu"; + dmas = <&audma0 0x07>, <&audma1 0x08>, + <&audma0 0x6f>, <&audma1 0x70>, + <&audma0 0x6f>, <&audma1 0x70>, + <&audma0 0x21>, <&audma1 0x22>, + <&audma0 0x23>, <&audma1 0x24>, + <&audma0 0x25>, <&audma1 0x26>, + <&audma0 0x27>, <&audma1 0x28>, + <&audma0 0x29>, <&audma1 0x2a>, + <&audma0 0x2b>, <&audma1 0x2c>, + <&audma0 0x2d>, <&audma1 0x2e>; + dma-names = "rx", "tx", + "rxu", "txu", + "rxu0", "txu0", + "rxu1", "txu1", + "rxu2", "txu2", + "rxu3", "txu3", + "rxu4", "txu4", + "rxu5", "txu5", + "rxu6", "txu6", + "rxu7", "txu7"; }; ssi4: ssi-4 { interrupts = ; - dmas = <&audma0 0x09>, <&audma1 0x0a>, <&audma0 0x71>, <&audma1 0x72>; - dma-names = "rx", "tx", "rxu", "txu"; + dmas = <&audma0 0x09>, <&audma1 0x0a>, + <&audma0 0x71>, <&audma1 0x72>, + <&audma0 0x71>, <&audma1 0x72>, + <&audma0 0x17>, <&audma1 0x18>, + <&audma0 0x19>, <&audma1 0x1a>, + <&audma0 0x1b>, <&audma1 0x1c>, + <&audma0 0x1d>, <&audma1 0x1e>, + <&audma0 0x1f>, <&audma1 0x20>, + <&audma0 0x31>, <&audma1 0x32>, + <&audma0 0x33>, <&audma1 0x34>; + dma-names = "rx", "tx", + "rxu", "txu", + "rxu0", "txu0", + "rxu1", "txu1", + "rxu2", "txu2", + "rxu3", "txu3", + "rxu4", "txu4", + "rxu5", "txu5", + "rxu6", "txu6", + "rxu7", "txu7"; }; ssi5: ssi-5 { interrupts = ; - dmas = <&audma0 0x0b>, <&audma1 0x0c>, <&audma0 0x73>, <&audma1 0x74>; - dma-names = "rx", "tx", "rxu", "txu"; + dmas = <&audma0 0x0b>, <&audma1 0x0c>, + <&audma0 0x73>, <&audma1 0x74>, + <&audma0 0x73>, <&audma1 0x74>; + dma-names = "rx", "tx", + "rxu", "txu", + "rxu0", "txu0"; }; ssi6: ssi-6 { interrupts = ; - dmas = <&audma0 0x0d>, <&audma1 0x0e>, <&audma0 0x75>, <&audma1 0x76>; - dma-names = "rx", "tx", "rxu", "txu"; + dmas = <&audma0 0x0d>, <&audma1 0x0e>, + <&audma0 0x75>, <&audma1 0x76>, + <&audma0 0x75>, <&audma1 0x76>; + dma-names = "rx", "tx", + "rxu", "txu", + "rxu0", "txu0"; }; ssi7: ssi-7 { interrupts = ; - dmas = <&audma0 0x0f>, <&audma1 0x10>, <&audma0 0x79>, <&audma1 0x7a>; - dma-names = "rx", "tx", "rxu", "txu"; + dmas = <&audma0 0x0f>, <&audma1 0x10>, + <&audma0 0x79>, <&audma1 0x7a>, + <&audma0 0x79>, <&audma1 0x7a>; + dma-names = "rx", "tx", + "rxu", "txu", + "rxu0", "txu0"; }; ssi8: ssi-8 { interrupts = ; - dmas = <&audma0 0x11>, <&audma1 0x12>, <&audma0 0x7b>, <&audma1 0x7c>; - dma-names = "rx", "tx", "rxu", "txu"; + dmas = <&audma0 0x11>, <&audma1 0x12>, + <&audma0 0x7b>, <&audma1 0x7c>, + <&audma0 0x7b>, <&audma1 0x7c>; + dma-names = "rx", "tx", + "rxu", "txu", + "rxu0", "txu0"; }; ssi9: ssi-9 { interrupts = ; - dmas = <&audma0 0x13>, <&audma1 0x14>, <&audma0 0x7d>, <&audma1 0x7e>; - dma-names = "rx", "tx", "rxu", "txu"; + dmas = <&audma0 0x13>, <&audma1 0x14>, + <&audma0 0x7d>, <&audma1 0x7e>, + <&audma0 0x7d>, <&audma1 0x7e>, + <&audma0 0x7f>, <&audma1 0x80>, + <&audma0 0x81>, <&audma1 0x82>, + <&audma0 0x83>, <&audma1 0x84>, + <&audma0 0xa3>, <&audma1 0xa4>, + <&audma0 0xa5>, <&audma1 0xa6>, + <&audma0 0xa7>, <&audma1 0xa8>, + <&audma0 0xa9>, <&audma1 0xaa>; + dma-names = "rx", "tx", + "rxu", "txu", + "rxu0", "txu0", + "rxu1", "txu1", + "rxu2", "txu2", + "rxu3", "txu3", + "rxu4", "txu4", + "rxu5", "txu5", + "rxu6", "txu6", + "rxu7", "txu7"; }; }; From patchwork Wed Oct 3 08:58:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Jiada" X-Patchwork-Id: 10624431 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D9E9713BB for ; Wed, 3 Oct 2018 08:59:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9AC7285ED for ; Wed, 3 Oct 2018 08:59:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BC93E2864B; Wed, 3 Oct 2018 08:59:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F672285ED for ; Wed, 3 Oct 2018 08:59:48 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 235DA267844; Wed, 3 Oct 2018 10:59:26 +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 CD8062678CC; Wed, 3 Oct 2018 10:59:23 +0200 (CEST) Received: from relay1.mentorg.com (relay1.mentorg.com [192.94.38.131]) by alsa0.perex.cz (Postfix) with ESMTP id 19BCB2676A7 for ; Wed, 3 Oct 2018 10:59:18 +0200 (CEST) Received: from svr-orw-mbx-03.mgc.mentorg.com ([147.34.90.203]) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1g7d01-00029y-8e from Jiada_Wang@mentor.com ; Wed, 03 Oct 2018 01:59:17 -0700 Received: from jiwang-OptiPlex-980.tokyo.mentorg.com (147.34.91.1) by svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Wed, 3 Oct 2018 01:59:13 -0700 From: To: , , , , Date: Wed, 3 Oct 2018 17:58:50 +0900 Message-ID: <20181003085855.4305-5-jiada_wang@mentor.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20181003085855.4305-1-jiada_wang@mentor.com> References: <20181003085855.4305-1-jiada_wang@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: svr-orw-mbx-08.mgc.mentorg.com (147.34.90.208) To svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [alsa-devel] [PATCH linux-next v2 4/9] arm64: r8a7795: change to use extended audio dmac register 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jiada Wang Basic audio dmac register only supports busif from 0 to 3, in order to use busif4 ~ busif7, extended audio dmac register need to be used. Signed-off-by: Jiada Wang --- arch/arm64/boot/dts/renesas/r8a7795.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi index fc6100eddfed..257c33887e19 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi @@ -1796,7 +1796,7 @@ <0 0xec5a0000 0 0x100>, /* ADG */ <0 0xec540000 0 0x1000>, /* SSIU */ <0 0xec541000 0 0x280>, /* SSI */ - <0 0xec740000 0 0x200>; /* Audio DMAC peri peri*/ + <0 0xec760000 0 0x200>; /* Audio DMAC peri peri*/ reg-names = "scu", "adg", "ssiu", "ssi", "audmapp"; clocks = <&cpg CPG_MOD 1005>, From patchwork Wed Oct 3 09:00:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Jiada" X-Patchwork-Id: 10624433 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 73E9D175A for ; Wed, 3 Oct 2018 09:00:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4521728738 for ; Wed, 3 Oct 2018 09:00:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 433EA28759; Wed, 3 Oct 2018 09:00:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BBF0C28751 for ; Wed, 3 Oct 2018 09:00:31 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 88F1F267772; Wed, 3 Oct 2018 11:00:30 +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 BB72426783D; Wed, 3 Oct 2018 11:00:28 +0200 (CEST) Received: from relay1.mentorg.com (relay1.mentorg.com [192.94.38.131]) by alsa0.perex.cz (Postfix) with ESMTP id 0D009267736 for ; Wed, 3 Oct 2018 11:00:26 +0200 (CEST) Received: from svr-orw-mbx-03.mgc.mentorg.com ([147.34.90.203]) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1g7d18-0002L4-0y from Jiada_Wang@mentor.com ; Wed, 03 Oct 2018 02:00:26 -0700 Received: from jiwang-OptiPlex-980.tokyo.mentorg.com (147.34.91.1) by svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Wed, 3 Oct 2018 02:00:22 -0700 From: To: , , , , Date: Wed, 3 Oct 2018 18:00:17 +0900 Message-ID: <20181003090017.4363-1-jiada_wang@mentor.com> X-Mailer: git-send-email 2.17.0 MIME-Version: 1.0 X-ClientProxiedBy: SVR-ORW-MBX-07.mgc.mentorg.com (147.34.90.207) To svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [alsa-devel] [PATCH linux-next v2 5/9] arm64: r8a7796: change to use extended audio dmac register 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jiada Wang Basic audio dmac register only supports busif from 0 to 3, in order to use busif4 ~ busif7, extended audio dmac register need to be used. Signed-off-by: Jiada Wang --- arch/arm64/boot/dts/renesas/r8a7796.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi index 53b361c5b16d..4526f62ee1f0 100644 --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi @@ -1670,7 +1670,7 @@ <0 0xec5a0000 0 0x100>, /* ADG */ <0 0xec540000 0 0x1000>, /* SSIU */ <0 0xec541000 0 0x280>, /* SSI */ - <0 0xec740000 0 0x200>; /* Audio DMAC peri peri*/ + <0 0xec760000 0 0x200>; /* Audio DMAC peri peri*/ reg-names = "scu", "adg", "ssiu", "ssi", "audmapp"; clocks = <&cpg CPG_MOD 1005>, From patchwork Wed Oct 3 09:00:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Jiada" X-Patchwork-Id: 10624435 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BBC34175A for ; Wed, 3 Oct 2018 09:00:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A74232870B for ; Wed, 3 Oct 2018 09:00:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A541E2873C; Wed, 3 Oct 2018 09:00:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 299272873A for ; Wed, 3 Oct 2018 09:00:49 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 0389F26783D; Wed, 3 Oct 2018 11:00:48 +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 7AD302678B0; Wed, 3 Oct 2018 11:00:45 +0200 (CEST) Received: from relay1.mentorg.com (relay1.mentorg.com [192.94.38.131]) by alsa0.perex.cz (Postfix) with ESMTP id BF9B6267736 for ; Wed, 3 Oct 2018 11:00:43 +0200 (CEST) Received: from svr-orw-mbx-03.mgc.mentorg.com ([147.34.90.203]) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1g7d1O-0002P3-Su from Jiada_Wang@mentor.com ; Wed, 03 Oct 2018 02:00:42 -0700 Received: from jiwang-OptiPlex-980.tokyo.mentorg.com (147.34.91.1) by svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Wed, 3 Oct 2018 02:00:39 -0700 From: To: , , , , Date: Wed, 3 Oct 2018 18:00:34 +0900 Message-ID: <20181003090034.4411-1-jiada_wang@mentor.com> X-Mailer: git-send-email 2.17.0 MIME-Version: 1.0 X-ClientProxiedBy: svr-orw-mbx-04.mgc.mentorg.com (147.34.90.204) To svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [alsa-devel] [PATCH linux-next v2 6/9] arm64: r8a774a1: change to use extended audio dmac register 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jiada Wang Basic audio dmac register only supports busif from 0 to 3, in order to use busif4 ~ busif7, extended audio dmac register need to be used. Signed-off-by: Jiada Wang --- arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi index ad2c9c0148ae..c04ca03f2987 100644 --- a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi @@ -1120,7 +1120,7 @@ <0 0xec5a0000 0 0x100>, /* ADG */ <0 0xec540000 0 0x1000>, /* SSIU */ <0 0xec541000 0 0x280>, /* SSI */ - <0 0xec740000 0 0x200>; /* Audio DMAC peri peri*/ + <0 0xec760000 0 0x200>; /* Audio DMAC peri peri*/ reg-names = "scu", "adg", "ssiu", "ssi", "audmapp"; clocks = <&cpg CPG_MOD 1005>, From patchwork Wed Oct 3 09:01:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Jiada" X-Patchwork-Id: 10624437 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 36973175A for ; Wed, 3 Oct 2018 09:01:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 27B5628723 for ; Wed, 3 Oct 2018 09:01:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 25F2728750; Wed, 3 Oct 2018 09:01:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B252C28723 for ; Wed, 3 Oct 2018 09:01:17 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 969EF2678B0; Wed, 3 Oct 2018 11:01:16 +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 B60E62678B0; Wed, 3 Oct 2018 11:01:14 +0200 (CEST) Received: from relay1.mentorg.com (relay1.mentorg.com [192.94.38.131]) by alsa0.perex.cz (Postfix) with ESMTP id 202C3267736 for ; Wed, 3 Oct 2018 11:01:12 +0200 (CEST) Received: from svr-orw-mbx-03.mgc.mentorg.com ([147.34.90.203]) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1g7d1s-0002cy-2n from Jiada_Wang@mentor.com ; Wed, 03 Oct 2018 02:01:12 -0700 Received: from jiwang-OptiPlex-980.tokyo.mentorg.com (147.34.91.1) by svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Wed, 3 Oct 2018 02:01:08 -0700 From: To: , , , , Date: Wed, 3 Oct 2018 18:01:03 +0900 Message-ID: <20181003090103.4460-1-jiada_wang@mentor.com> X-Mailer: git-send-email 2.17.0 MIME-Version: 1.0 X-ClientProxiedBy: svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) To svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) Cc: jiada_wang@mentor.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [alsa-devel] [PATCH linux-next v2 7/9] arm64: r8a77965: change to use extended audio dmac register 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jiada Wang Basic audio dmac register only supports busif from 0 to 3, in order to use busif4 ~ busif7, extended audio dmac register need to be used. Signed-off-by: Jiada Wang --- arch/arm64/boot/dts/renesas/r8a77965.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/renesas/r8a77965.dtsi b/arch/arm64/boot/dts/renesas/r8a77965.dtsi index fd00010a5ed7..6c0d5053a81c 100644 --- a/arch/arm64/boot/dts/renesas/r8a77965.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a77965.dtsi @@ -1405,7 +1405,7 @@ <0 0xec5a0000 0 0x100>, /* ADG */ <0 0xec540000 0 0x1000>, /* SSIU */ <0 0xec541000 0 0x280>, /* SSI */ - <0 0xec740000 0 0x200>; /* Audio DMAC peri peri*/ + <0 0xec760000 0 0x200>; /* Audio DMAC peri peri*/ /* placeholder */ rcar_sound,dvc { From patchwork Wed Oct 3 09:01:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Jiada" X-Patchwork-Id: 10624439 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E6E431731 for ; Wed, 3 Oct 2018 09:01:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D3C8128765 for ; Wed, 3 Oct 2018 09:01:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D15C428764; Wed, 3 Oct 2018 09:01:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 33EB428721 for ; Wed, 3 Oct 2018 09:01:36 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id F416C26783D; Wed, 3 Oct 2018 11:01:34 +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 EF50A2678C3; Wed, 3 Oct 2018 11:01:32 +0200 (CEST) Received: from relay1.mentorg.com (relay1.mentorg.com [192.94.38.131]) by alsa0.perex.cz (Postfix) with ESMTP id 04428267772 for ; Wed, 3 Oct 2018 11:01:31 +0200 (CEST) Received: from svr-orw-mbx-03.mgc.mentorg.com ([147.34.90.203]) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1g7d2A-0002j0-4w from Jiada_Wang@mentor.com ; Wed, 03 Oct 2018 02:01:30 -0700 Received: from jiwang-OptiPlex-980.tokyo.mentorg.com (147.34.91.1) by svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Wed, 3 Oct 2018 02:01:26 -0700 From: To: , , , , Date: Wed, 3 Oct 2018 18:01:22 +0900 Message-ID: <20181003090122.4508-1-jiada_wang@mentor.com> X-Mailer: git-send-email 2.17.0 MIME-Version: 1.0 X-ClientProxiedBy: svr-orw-mbx-02.mgc.mentorg.com (147.34.90.202) To svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) Cc: jiada_wang@mentor.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [alsa-devel] [PATCH linux-next v2 8/9] ASoC: rsnd: ssi: Request dedicated dma channels for busif0 to 7 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jiada Wang Currently ssi driver only request dma channel for SSI_0, which is used to transfer data to/from busif0. But in GEN3 busif1 to busif7 also maybe used, dedicated dma channels are requested for data transfer through these busif. Signed-off-by: Jiada Wang --- sound/soc/sh/rcar/ssi.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 3adcc4f778f7..992aeac09e76 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -76,6 +76,8 @@ #define SSI_NAME "ssi" +#define SSI_DMA_NAME_SIZE 10 + struct rsnd_ssi { struct rsnd_mod mod; @@ -938,12 +940,28 @@ static struct dma_chan *rsnd_ssi_dma_req(struct rsnd_dai_stream *io, { struct rsnd_priv *priv = rsnd_mod_to_priv(mod); int is_play = rsnd_io_is_play(io); - char *name; + char name[SSI_DMA_NAME_SIZE]; - if (rsnd_ssi_use_busif(io)) - name = is_play ? "rxu" : "txu"; - else - name = is_play ? "rx" : "tx"; + if (rsnd_ssi_use_busif(io)) { + if (is_play) + snprintf(name, SSI_DMA_NAME_SIZE, "rxu"); + else + snprintf(name, SSI_DMA_NAME_SIZE, "txu"); + + if (rsnd_is_gen3(priv)) { + /* + * Gen3 supports to use all available BUSIF + */ + int busif = rsnd_ssi_get_busif(io); + + snprintf(name, SSI_DMA_NAME_SIZE, "%s%d", name, busif); + } + } else { + if (is_play) + snprintf(name, SSI_DMA_NAME_SIZE, "rx"); + else + snprintf(name, SSI_DMA_NAME_SIZE, "tx"); + } return rsnd_dma_request_channel(rsnd_ssi_of_node(priv), mod, name); From patchwork Wed Oct 3 09:01:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Jiada" X-Patchwork-Id: 10624441 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 71EF4175A for ; Wed, 3 Oct 2018 09:01:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5E2E52870B for ; Wed, 3 Oct 2018 09:01:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 516862870D; Wed, 3 Oct 2018 09:01:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 82ACA2870B for ; Wed, 3 Oct 2018 09:01:50 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 579A1267889; Wed, 3 Oct 2018 11:01:49 +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 6C5972678F7; Wed, 3 Oct 2018 11:01:47 +0200 (CEST) Received: from relay1.mentorg.com (relay1.mentorg.com [192.94.38.131]) by alsa0.perex.cz (Postfix) with ESMTP id AB4E4267844 for ; Wed, 3 Oct 2018 11:01:45 +0200 (CEST) Received: from svr-orw-mbx-03.mgc.mentorg.com ([147.34.90.203]) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1g7d2O-0002lr-Q0 from Jiada_Wang@mentor.com ; Wed, 03 Oct 2018 02:01:44 -0700 Received: from jiwang-OptiPlex-980.tokyo.mentorg.com (147.34.91.1) by svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Wed, 3 Oct 2018 02:01:41 -0700 From: To: , , , , Date: Wed, 3 Oct 2018 18:01:36 +0900 Message-ID: <20181003090136.4556-1-jiada_wang@mentor.com> X-Mailer: git-send-email 2.17.0 MIME-Version: 1.0 X-ClientProxiedBy: svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) To svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) Cc: jiada_wang@mentor.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [alsa-devel] [PATCH linux-next v2 9/9] ASoC: rsnd: add busif property to dai stream 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jiada Wang in GEN3 SSI may use different BUSIF for data transfer, this patch adds busif property to each dai stream, to indicate the BUSIF used by playback/capture stream. Also adds rsnd_ssi_select_busif() to automatically select BUSIF (currently only BUSIF0 is selected) Signed-off-by: Jiada Wang --- sound/soc/sh/rcar/core.c | 3 +++ sound/soc/sh/rcar/dma.c | 31 +++++++++++++++++++++++++++++++ sound/soc/sh/rcar/rsnd.h | 3 +++ sound/soc/sh/rcar/ssi.c | 30 +++++++++++++++++++++++++++++- 4 files changed, 66 insertions(+), 1 deletion(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 40d7dc4f7839..5e3e6e65bcdf 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -1158,6 +1158,9 @@ static int rsnd_hw_params(struct snd_pcm_substream *substream, struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai); struct rsnd_dai_stream *io = rsnd_rdai_to_io(rdai, substream); int ret; + int chan = rsnd_runtime_channel_for_ssi_with_params(io, hw_params); + + rsnd_ssi_select_busif(io, chan); ret = rsnd_dai_call(hw_params, io, substream, hw_params); if (ret) diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c index 6d1947515dc8..bf87939f79bb 100644 --- a/sound/soc/sh/rcar/dma.c +++ b/sound/soc/sh/rcar/dma.c @@ -792,6 +792,37 @@ int rsnd_dma_attach(struct rsnd_dai_stream *io, struct rsnd_mod *mod, return rsnd_dai_connect(*dma_mod, io, (*dma_mod)->type); } +void rsnd_dma_addr_update(struct rsnd_dai_stream *io) +{ + struct rsnd_mod *ssi_mod = rsnd_io_to_mod_ssi(io); + struct rsnd_mod *mod_from = NULL; + struct rsnd_mod *mod_to = NULL; + struct rsnd_priv *priv = rsnd_io_to_priv(io); + struct rsnd_dma_ctrl *dmac = rsnd_priv_to_dmac(priv); + struct device *dev = rsnd_priv_to_dev(priv); + int is_play = rsnd_io_is_play(io); + struct rsnd_dma *dma = rsnd_mod_to_dma(io->dma); + + if (!dmac) + return; + + rsnd_dma_of_path(ssi_mod, io, is_play, &mod_from, &mod_to); + + dma->src_addr = rsnd_dma_addr(io, mod_from, is_play, 1); + dma->dst_addr = rsnd_dma_addr(io, mod_to, is_play, 0); + + if (mod_from && mod_to) { + struct rsnd_dmapp *dmapp = rsnd_dma_to_dmapp(dma); + + dmapp->chcr = rsnd_dmapp_get_chcr(io, mod_from, mod_to) | + PDMACHCR_DE; + } + + dev_dbg(dev, "%s[%d] %pad -> %pad\n", + rsnd_mod_name(ssi_mod), rsnd_mod_id(ssi_mod), + &dma->src_addr, &dma->dst_addr); +} + int rsnd_dma_probe(struct rsnd_priv *priv) { struct platform_device *pdev = rsnd_priv_to_pdev(priv); diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index 4464d1d0a042..7ce10267c87b 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -227,12 +227,14 @@ void rsnd_bset(struct rsnd_priv *priv, struct rsnd_mod *mod, enum rsnd_reg reg, u32 rsnd_get_adinr_bit(struct rsnd_mod *mod, struct rsnd_dai_stream *io); u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io); u32 rsnd_get_busif_shift(struct rsnd_dai_stream *io, struct rsnd_mod *mod); +void rsnd_ssi_select_busif(struct rsnd_dai_stream *io, int chan); /* * R-Car DMA */ int rsnd_dma_attach(struct rsnd_dai_stream *io, struct rsnd_mod *mod, struct rsnd_mod **dma_mod); +void rsnd_dma_addr_update(struct rsnd_dai_stream *io); int rsnd_dma_probe(struct rsnd_priv *priv); struct dma_chan *rsnd_dma_request_channel(struct device_node *of_node, struct rsnd_mod *mod, char *name); @@ -457,6 +459,7 @@ struct rsnd_dai_stream { struct rsnd_dai *rdai; struct device *dmac_dev; /* for IPMMU */ u32 parent_ssi_status; + u32 busif; }; #define rsnd_io_to_mod(io, i) ((i) < RSND_MOD_MAX ? (io)->mod[(i)] : NULL) #define rsnd_io_to_mod_ssi(io) rsnd_io_to_mod((io), RSND_MOD_SSI) diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 992aeac09e76..d515ee192276 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -154,7 +154,35 @@ int rsnd_ssi_use_busif(struct rsnd_dai_stream *io) int rsnd_ssi_get_busif(struct rsnd_dai_stream *io) { - return 0; /* BUSIF0 only for now */ + struct rsnd_priv *priv = rsnd_io_to_priv(io); + + if (!rsnd_is_gen3(priv)) + return 0; + + if (!rsnd_ssi_use_busif(io)) + return 0; + + return io->busif; +} + +void rsnd_ssi_select_busif(struct rsnd_dai_stream *io, int chan) +{ + struct rsnd_priv *priv = rsnd_io_to_priv(io); + u32 busif = 0; /* BUSIF0 only for now */ + + if (!rsnd_is_gen3(priv)) + return; + + if (!rsnd_ssi_use_busif(io)) + return; + + /* FIXME: calcuate BUSIF based on SSI mode in future */ + if (io->busif == busif) + return; + + io->busif = busif; + + rsnd_dma_addr_update(io); } static void rsnd_ssi_status_clear(struct rsnd_mod *mod)