From patchwork Tue Jul 17 19:47:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Kaneko X-Patchwork-Id: 10530435 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 24643601D2 for ; Tue, 17 Jul 2018 19:58:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 128FD29451 for ; Tue, 17 Jul 2018 19:58:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 069092948F; Tue, 17 Jul 2018 19:58:09 +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, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8EDBA29451 for ; Tue, 17 Jul 2018 19:58:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=D0jBRBxHBmhOKEKD5E9iuP0KL948+gWmlqemOQbLuSI=; b=huRo5XgaifsKrM362q+TY+2wA+ fzsfLkyg0t4sRK5oQmpBXOtDe3tSMq8bT37N+rVZQqm9P45cmVLgY3dj7rLzkpDSr64HmFQlmb1ui am9srJP1J8+mSarPYpm9YmeayuHRLyjUJohAD8MDECvU6x4yOw9RITc1GOSkvFHOYJCrTQSMVPEVE pBqAJHHG4vQXnLJzg7lmj7bpc0sCExCQ1XX8nocjSZyeCzdGAQf56g0qcbR4Aq4X+EsIc6nmvWn2D jJdtrExU38FF3tGdjaJAbLY6ZQUZ197GYlqE9pntroas/wrWkIoDImsvvsWOYVc4PeavfJRx6GKix rQ9YNQtA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1ffW6l-0001Kp-KI; Tue, 17 Jul 2018 19:58:03 +0000 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1ffVxX-00045Y-TP for linux-arm-kernel@lists.infradead.org; Tue, 17 Jul 2018 19:48:37 +0000 Received: by mail-pg1-x541.google.com with SMTP id r5-v6so895305pgv.0 for ; Tue, 17 Jul 2018 12:48:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pNRXDiSrhWL4O+qKa9IhoHRZpXTSkl93coBtRf/E7sc=; b=XpmcaVJE5Trtbl1DbOiW8lqI49C+AFhqI4jMPYHsiLL7caOUf/1A0HxeS7xs1uymYM 3YJ//BKRaswc1PV62Y4bJnzkou8II/Ot7GNUzJuV4BLvwZep4cegCPHVifCatBHYI72A AFeZTDyjg1raVDSI2PFsvY6X9H41JSrNV4TnXx/wLv0xLRVfOBrPNIBNPfivfjFk6VzU jsX8X85uDQq1b6ky4SN+CGuXtfGrkfvahiQJvhfZD3Zw+FIEL02RTsKhThnjU35FsYV2 PQmF5Nf/Dkol6lHC50Bt5u+ibqntKekbomr7RivLmAOCwCHDqKsZ0BFL5C51+sBPXTgA 48kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=pNRXDiSrhWL4O+qKa9IhoHRZpXTSkl93coBtRf/E7sc=; b=uanvGXM9EQIc7+hSsGsBTS1fYVr5di3r6E7LfEB6R2Wvg94nSJeB0uCc1y9JirJ/vA 0PbbpVSmrDPQL4Dp6zvMNVrlW+YHULG3r65nZ2FwdTWz6Vbx0pQT7Q92tRs5Uq+fJwDv 1zCE8A3nKWKJjKdinxiEO6kEhwctsukkkbWCNS79QJmGYEkaTBkNYl+DXzRaS4QvsyUo ADhGT1988hOIqD8DfVUDquQNcZe0/H5HIdzeLkzk/he4EAIpFbt6DE5Tac5tY77Za0kr CBfC7RLI+ScuHgfD4NJddYHuxK/QnSuiDIOmfAXouBcXOb3r1Ur8m3zdgSaoBCjaBhJP dJXQ== X-Gm-Message-State: AOUpUlHJt3YpOeGjhNDsXwPMaY5RVqVOHfSrJOpcS7n8wO/JlMWYHgbf AnUN162JUrX9TBBkhcUtPUU= X-Google-Smtp-Source: AAOMgpcgrYeO4VO/m1HEIWe5jqpOWeX5XwpSDlyFU4QkXIB9+U13h7FhnJ7gCyMTCUkdI1YG9PF/ZQ== X-Received: by 2002:a62:4bc6:: with SMTP id d67-v6mr2005567pfj.175.1531856901391; Tue, 17 Jul 2018 12:48:21 -0700 (PDT) Received: from localhost.localdomain (KD118155013174.ppp-bb.dion.ne.jp. [118.155.13.174]) by smtp.gmail.com with ESMTPSA id g5-v6sm4469608pgn.73.2018.07.17.12.48.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Jul 2018 12:48:20 -0700 (PDT) From: Yoshihiro Kaneko To: linux-renesas-soc@vger.kernel.org Subject: [PATCH/RFT 3/7] arm64: dts: renesas: r8a77965: Add Sound device node and SSI support Date: Wed, 18 Jul 2018 04:47:59 +0900 Message-Id: <1531856883-19645-4-git-send-email-ykaneko0929@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1531856883-19645-1-git-send-email-ykaneko0929@gmail.com> References: <1531856883-19645-1-git-send-email-ykaneko0929@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180717_124832_246535_33EE5651 X-CRM114-Status: GOOD ( 15.37 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Simon Horman , Magnus Damm , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Takeshi Kihara Based on several similar patches of the R8A7796 device tree by Kuninori Morimoto . Signed-off-by: Takeshi Kihara Signed-off-by: Yoshihiro Kaneko Acked-by: Kuninori Morimoto --- arch/arm64/boot/dts/renesas/r8a77965.dtsi | 109 +++++++++++++++++++++++------- 1 file changed, 85 insertions(+), 24 deletions(-) diff --git a/arch/arm64/boot/dts/renesas/r8a77965.dtsi b/arch/arm64/boot/dts/renesas/r8a77965.dtsi index c0dbabd..c5d6ab4 100644 --- a/arch/arm64/boot/dts/renesas/r8a77965.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a77965.dtsi @@ -12,7 +12,7 @@ #include #include -#define CPG_AUDIO_CLK_I 10 +#define CPG_AUDIO_CLK_I R8A77965_CLK_S0D4 / { compatible = "renesas,r8a77965"; @@ -1324,42 +1324,103 @@ }; rcar_sound: sound@ec500000 { + /* + * #sound-dai-cells is required + * + * Single DAI : #sound-dai-cells = <0>; <&rcar_sound>; + * Multi DAI : #sound-dai-cells = <1>; <&rcar_sound N>; + */ + /* + * #clock-cells is required for audio_clkout0/1/2/3 + * + * clkout : #clock-cells = <0>; <&rcar_sound>; + * clkout0/1/2/3: #clock-cells = <1>; <&rcar_sound N>; + */ + compatible = "renesas,rcar_sound-r8a7796", "renesas,rcar_sound-gen3"; reg = <0 0xec500000 0 0x1000>, /* SCU */ <0 0xec5a0000 0 0x100>, /* ADG */ <0 0xec540000 0 0x1000>, /* SSIU */ <0 0xec541000 0 0x280>, /* SSI */ <0 0xec740000 0 0x200>; /* Audio DMAC peri peri*/ - /* placeholder */ + reg-names = "scu", "adg", "ssiu", "ssi", "audmapp"; + + clocks = <&cpg CPG_MOD 1005>, + <&cpg CPG_MOD 1006>, <&cpg CPG_MOD 1007>, + <&cpg CPG_MOD 1008>, <&cpg CPG_MOD 1009>, + <&cpg CPG_MOD 1010>, <&cpg CPG_MOD 1011>, + <&cpg CPG_MOD 1012>, <&cpg CPG_MOD 1013>, + <&cpg CPG_MOD 1014>, <&cpg CPG_MOD 1015>, + <&audio_clk_a>, <&audio_clk_b>, + <&audio_clk_c>, + <&cpg CPG_CORE R8A77965_CLK_S0D4>; + clock-names = "ssi-all", + "ssi.9", "ssi.8", "ssi.7", "ssi.6", + "ssi.5", "ssi.4", "ssi.3", "ssi.2", + "ssi.1", "ssi.0", + "clk_a", "clk_b", "clk_c", "clk_i"; + power-domains = <&sysc R8A77965_PD_ALWAYS_ON>; + resets = <&cpg 1005>, + <&cpg 1006>, <&cpg 1007>, + <&cpg 1008>, <&cpg 1009>, + <&cpg 1010>, <&cpg 1011>, + <&cpg 1012>, <&cpg 1013>, + <&cpg 1014>, <&cpg 1015>; + reset-names = "ssi-all", + "ssi.9", "ssi.8", "ssi.7", "ssi.6", + "ssi.5", "ssi.4", "ssi.3", "ssi.2", + "ssi.1", "ssi.0"; + status = "disabled"; - rcar_sound,dvc { - dvc0: dvc-0 { + rcar_sound,ssi { + ssi0: ssi-0 { + interrupts = ; + dmas = <&audma0 0x01>, <&audma1 0x02>, <&audma0 0x15>, <&audma1 0x16>; + dma-names = "rx", "tx", "rxu", "txu"; }; - dvc1: dvc-1 { + ssi1: ssi-1 { + interrupts = ; + dmas = <&audma0 0x03>, <&audma1 0x04>, <&audma0 0x49>, <&audma1 0x4a>; + dma-names = "rx", "tx", "rxu", "txu"; }; - }; - - rcar_sound,src { - src0: src-0 { + ssi2: ssi-2 { + interrupts = ; + dmas = <&audma0 0x05>, <&audma1 0x06>, <&audma0 0x63>, <&audma1 0x64>; + dma-names = "rx", "tx", "rxu", "txu"; }; - src1: src-1 { + ssi3: ssi-3 { + interrupts = ; + dmas = <&audma0 0x07>, <&audma1 0x08>, <&audma0 0x6f>, <&audma1 0x70>; + dma-names = "rx", "tx", "rxu", "txu"; }; - }; - - rcar_sound,ssi { - ssi0: ssi-0 { + ssi4: ssi-4 { + interrupts = ; + dmas = <&audma0 0x09>, <&audma1 0x0a>, <&audma0 0x71>, <&audma1 0x72>; + dma-names = "rx", "tx", "rxu", "txu"; }; - ssi1: ssi-1 { + ssi5: ssi-5 { + interrupts = ; + dmas = <&audma0 0x0b>, <&audma1 0x0c>, <&audma0 0x73>, <&audma1 0x74>; + dma-names = "rx", "tx", "rxu", "txu"; }; - }; - - ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { - reg = <0>; + ssi6: ssi-6 { + interrupts = ; + dmas = <&audma0 0x0d>, <&audma1 0x0e>, <&audma0 0x75>, <&audma1 0x76>; + dma-names = "rx", "tx", "rxu", "txu"; }; - port@1 { - reg = <1>; + ssi7: ssi-7 { + interrupts = ; + dmas = <&audma0 0x0f>, <&audma1 0x10>, <&audma0 0x79>, <&audma1 0x7a>; + dma-names = "rx", "tx", "rxu", "txu"; + }; + ssi8: ssi-8 { + interrupts = ; + dmas = <&audma0 0x11>, <&audma1 0x12>, <&audma0 0x7b>, <&audma1 0x7c>; + dma-names = "rx", "tx", "rxu", "txu"; + }; + ssi9: ssi-9 { + interrupts = ; + dmas = <&audma0 0x13>, <&audma1 0x14>, <&audma0 0x7d>, <&audma1 0x7e>; + dma-names = "rx", "tx", "rxu", "txu"; }; }; };