From patchwork Thu Jan 24 15:12:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 10779375 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 66E9C91E for ; Thu, 24 Jan 2019 15:27:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5441830B97 for ; Thu, 24 Jan 2019 15:27:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4845430BA0; Thu, 24 Jan 2019 15:27:45 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 C2E6730B97 for ; Thu, 24 Jan 2019 15:27:44 +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=tOj4v8FTUKNhLPZJz9gn+vSxt55EpUJ+a6PtvbCB9J8=; b=exEat2DM+/ylDh9AXO7LA/itlj dh61pASF4fytJyHuT2JItlk2pmspsM+zX2nf0CVjUZGRiRyJ0+vfBKmRuxAdFXfstNZOIlr2/ziP9 xBsxoCZKcSMBOcO6i0wJL0dSZghc0p26im/AOWsFcKE5aZ4GKdrEzksIA9LOHhVOwcTGYOKCv1+yh Py/vulJCH1p1qMGpQncdk1TIehTze4w4OgQLDAG0QeQCtGVn+ywFD97mjmBK2Zh1pCeS+/Wr7bDqq EVaoMYhXuTCeDEuDlpcsjNgJTIZ9fUiDl5WMXrqxYuMPPWFp8ZwgFqWiy7RvUP1KAZIsoJFTa3xa6 jCcwodxA==; 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 1gmguq-0000rT-HD; Thu, 24 Jan 2019 15:27:40 +0000 Received: from kirsty.vergenet.net ([202.4.237.240]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gmgqP-0007Ii-Rf for linux-arm-kernel@lists.infradead.org; Thu, 24 Jan 2019 15:23:07 +0000 Received: from reginn.horms.nl (watermunt.horms.nl [80.127.179.77]) by kirsty.vergenet.net (Postfix) with ESMTPA id 04FB325BF19; Fri, 25 Jan 2019 02:12:49 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1548342769; bh=FVv2yxGQcEYPDbykkdoY1N9O1as+GmnTeHaydBwLxjg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NrocfVFyKs1JJhS0XAIn+qLmnaSRMagWsoP6Dz9LUf+OoBDJpcka1uUQKwrwVWM7J rYaMaNgQ02e/2BLDv8IkT2iG58VsdjW+6RathX8p2EiwE62ri1YW67tM2VgNvD0Tr3 sRD0/va+OZq59PnAwudiqwEXYBaCQGwhqcYfRaxU= Received: by reginn.horms.nl (Postfix, from userid 7100) id 229C2940DB0; Thu, 24 Jan 2019 16:12:41 +0100 (CET) From: Simon Horman To: linux-renesas-soc@vger.kernel.org Subject: [PATCH 34/44] arm64: dts: renesas: ulcb: use audio-graph-card Date: Thu, 24 Jan 2019 16:12:28 +0100 Message-Id: <5d3b226ace6d8d6f1a9fecbfb21e7e743a88f33c.1548233325.git.horms+renesas@verge.net.au> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190124_072306_044284_9B2E9502 X-CRM114-Status: GOOD ( 11.08 ) 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 , Kuninori Morimoto , 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: Kuninori Morimoto ULCB can use daughter board which is called as KingFisher. It has extra sound interface, thus we want to use it. But, basically, ALSA SoC can't use Multiple sound card with single CPU sound interface (= SSI). Thus we need to use Single Sound Card with multiple DAI interface. To be easy to expand ULCB sound card on KingFisher, it is better to use multi-dai-link style sound card on ULCB sound DT. Now, "simple-audio-card" / "audio-graph-card" both can support multi-dai-link style, but HDMI sound support (which is not yet supported on ULCB) needs "audio-graph-card". Using audio-graph-card is better selection. This patch exchange current sound card to use it. Signed-off-by: Kuninori Morimoto Signed-off-by: Simon Horman --- arch/arm64/boot/dts/renesas/ulcb.dtsi | 39 ++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/arch/arm64/boot/dts/renesas/ulcb.dtsi b/arch/arm64/boot/dts/renesas/ulcb.dtsi index de694fdae067..8c6c45863ac8 100644 --- a/arch/arm64/boot/dts/renesas/ulcb.dtsi +++ b/arch/arm64/boot/dts/renesas/ulcb.dtsi @@ -83,20 +83,11 @@ regulator-always-on; }; - rsnd_ak4613: sound { - compatible = "simple-audio-card"; + sound_card: sound { + compatible = "audio-graph-card"; + label = "rcar-sound"; - simple-audio-card,format = "left_j"; - simple-audio-card,bitclock-master = <&sndcpu>; - simple-audio-card,frame-master = <&sndcpu>; - - sndcpu: simple-audio-card,cpu { - sound-dai = <&rcar_sound>; - }; - - sndcodec: simple-audio-card,codec { - sound-dai = <&ak4613>; - }; + dais = <&rsnd_port0>; }; vcc_sdhi0: regulator-vcc-sdhi0 { @@ -211,6 +202,12 @@ asahi-kasei,out4-single-end; asahi-kasei,out5-single-end; asahi-kasei,out6-single-end; + + port { + ak4613_endpoint: endpoint { + remote-endpoint = <&rsnd_for_ak4613>; + }; + }; }; cs2000: clk-multiplier@4f { @@ -384,10 +381,18 @@ <&audio_clk_c>, <&cpg CPG_CORE CPG_AUDIO_CLK_I>; - rcar_sound,dai { - dai0 { - playback = <&ssi0 &src0 &dvc0>; - capture = <&ssi1 &src1 &dvc1>; + ports { + rsnd_port0: port { + rsnd_for_ak4613: endpoint { + remote-endpoint = <&ak4613_endpoint>; + + dai-format = "left_j"; + bitclock-master = <&rsnd_for_ak4613>; + frame-master = <&rsnd_for_ak4613>; + + playback = <&ssi0 &src0 &dvc0>; + capture = <&ssi1 &src1 &dvc1>; + }; }; }; };