From patchwork Tue Sep 8 00:35:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 11762409 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0464392C for ; Tue, 8 Sep 2020 00:35:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E37AA21D1A for ; Tue, 8 Sep 2020 00:35:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728163AbgIHAf0 (ORCPT ); Mon, 7 Sep 2020 20:35:26 -0400 Received: from relmlor1.renesas.com ([210.160.252.171]:6866 "EHLO relmlie5.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727792AbgIHAf0 (ORCPT ); Mon, 7 Sep 2020 20:35:26 -0400 Date: 08 Sep 2020 09:35:25 +0900 X-IronPort-AV: E=Sophos;i="5.76,403,1592838000"; d="scan'208";a="56613437" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie5.idc.renesas.com with ESMTP; 08 Sep 2020 09:35:25 +0900 Received: from mercury.renesas.com (unknown [10.166.252.133]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id 0F80C4001DD5; Tue, 8 Sep 2020 09:35:25 +0900 (JST) Message-ID: <87a6y1rtun.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 10/10] arm64: dts: renesas: r8a77961-salvator-xs: add HDMI Sound support User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Rob Herring , Laurent , Geert Uytterhoeven , David Airlie , Daniel Vetter Cc: Magnus , Linux-Renesas , Linux-DT , Kieran Bingham , (Renesas) shimoda , dri-devel@lists.freedesktop.org In-Reply-To: <87o8mhrtxo.wl-kuninori.morimoto.gx@renesas.com> References: <87o8mhrtxo.wl-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org From: Kuninori Morimoto This patch enables HDMI Sound on R-Car M3-W+ Salvator-XS board. This reverts commit b997613fad58a03588f0f64a3d86db6c5bd76dd2. Signed-off-by: Kuninori Morimoto --- .../boot/dts/renesas/r8a77961-salvator-xs.dts | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/arch/arm64/boot/dts/renesas/r8a77961-salvator-xs.dts b/arch/arm64/boot/dts/renesas/r8a77961-salvator-xs.dts index ca21a702db54..1e7603365106 100644 --- a/arch/arm64/boot/dts/renesas/r8a77961-salvator-xs.dts +++ b/arch/arm64/boot/dts/renesas/r8a77961-salvator-xs.dts @@ -51,9 +51,38 @@ rcar_dw_hdmi0_out: endpoint { remote-endpoint = <&hdmi0_con>; }; }; + port@2 { + reg = <2>; + dw_hdmi0_snd_in: endpoint { + remote-endpoint = <&rsnd_endpoint1>; + }; + }; }; }; &hdmi0_con { remote-endpoint = <&rcar_dw_hdmi0_out>; }; + +&rcar_sound { + ports { + /* rsnd_port0 is on salvator-common */ + rsnd_port1: port@1 { + reg = <1>; + rsnd_endpoint1: endpoint { + remote-endpoint = <&dw_hdmi0_snd_in>; + + dai-format = "i2s"; + bitclock-master = <&rsnd_endpoint1>; + frame-master = <&rsnd_endpoint1>; + + playback = <&ssi2>; + }; + }; + }; +}; + +&sound_card { + dais = <&rsnd_port0 /* ak4613 */ + &rsnd_port1>; /* HDMI0 */ +};