devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Rob Herring <robh+dt@kernel.org>,
	Laurent <laurent.pinchart@ideasonboard.com>,
	Geert Uytterhoeven <geert+renesas@glider.be>,
	David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>
Cc: Magnus <magnus.damm@gmail.com>,
	Linux-Renesas <linux-renesas-soc@vger.kernel.org>,
	Linux-DT <devicetree@vger.kernel.org>,
	Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>,
	(Renesas) shimoda <yoshihiro.shimoda.uh@renesas.com>,
	dri-devel@lists.freedesktop.org
Subject: [PATCH v2 10/10] arm64: dts: renesas: r8a77961-salvator-xs: add HDMI Sound support
Date: 08 Sep 2020 09:35:25 +0900	[thread overview]
Message-ID: <87a6y1rtun.wl-kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <87o8mhrtxo.wl-kuninori.morimoto.gx@renesas.com>

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

This patch enables HDMI Sound on R-Car M3-W+ Salvator-XS board.

This reverts commit b997613fad58a03588f0f64a3d86db6c5bd76dd2.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 .../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  */
+};
-- 
2.25.1


  parent reply	other threads:[~2020-09-08  0:35 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-08  0:33 [PATCH v2 00/10] arm64: renesas: enable HDMI Display/Sound on R-Car M3-W+ Salvator-XS Kuninori Morimoto
2020-09-08  0:34 ` [PATCH v2 01/10] dt-bindings: display: renesas: du: Document the r8a77961 bindings Kuninori Morimoto
2020-09-08  5:53   ` Laurent Pinchart
2020-09-08 12:52   ` Kieran Bingham
2020-09-15 16:34   ` Rob Herring
2020-09-08  0:34 ` [PATCH v2 02/10] dt-bindings: display: renesas: dw-hdmi: tidyup example compatible Kuninori Morimoto
2020-09-08  5:54   ` Laurent Pinchart
2020-09-08 14:18   ` Kieran Bingham
2020-09-08 14:43     ` Laurent Pinchart
2020-09-08 14:46       ` Laurent Pinchart
2020-09-08 14:48         ` Kieran Bingham
2020-09-09 23:20           ` Kuninori Morimoto
2020-09-08  0:34 ` [PATCH v2 03/10] dt-bindings: display: renesas: dw-hdmi: Add R8A77961 support Kuninori Morimoto
2020-09-08  5:55   ` Laurent Pinchart
2020-09-08 14:35   ` Kieran Bingham
2020-09-15 16:35   ` Rob Herring
2020-09-08  0:34 ` [PATCH v2 04/10] drm: rcar-du: Add r8a77961 support Kuninori Morimoto
2020-09-08  5:56   ` Laurent Pinchart
2020-09-08 14:49   ` Kieran Bingham
2020-09-08  0:34 ` [PATCH v2 05/10] arm64: dts: renesas: r8a77961: Add FCP device nodes Kuninori Morimoto
2020-09-08  5:58   ` Laurent Pinchart
2020-09-08 14:50   ` Kieran Bingham
2020-09-10  9:33   ` Geert Uytterhoeven
2020-09-10 23:24     ` Kuninori Morimoto
2020-09-08  0:34 ` [PATCH v2 06/10] arm64: dts: renesas: r8a77961: Add VSP " Kuninori Morimoto
2020-09-08  6:01   ` Laurent Pinchart
2020-09-08 14:56   ` Kieran Bingham
2020-09-08  0:35 ` [PATCH v2 07/10] arm64: dts: renesas: r8a77961: Add DU " Kuninori Morimoto
2020-09-08  6:02   ` Laurent Pinchart
2020-09-08 15:11   ` Kieran Bingham
2020-09-10  9:49   ` Geert Uytterhoeven
2020-09-10  9:50   ` Geert Uytterhoeven
2020-09-10 23:20     ` Kuninori Morimoto
2020-09-10 23:22       ` Laurent Pinchart
2020-09-08  0:35 ` [PATCH v2 08/10] arm64: dts: renesas: r8a77961: Add HDMI " Kuninori Morimoto
2020-09-08  6:03   ` Laurent Pinchart
2020-09-10  9:52   ` Geert Uytterhoeven
2020-09-08  0:35 ` [PATCH v2 09/10] arm64: dts: renesas: r8a77961-salvator-xs: add HDMI Display support Kuninori Morimoto
2020-09-08  6:04   ` Laurent Pinchart
2020-09-10  9:56   ` Geert Uytterhoeven
2020-09-08  0:35 ` Kuninori Morimoto [this message]
2020-09-08  6:06   ` [PATCH v2 10/10] arm64: dts: renesas: r8a77961-salvator-xs: add HDMI Sound support Laurent Pinchart
2020-09-08  6:33     ` Kuninori Morimoto
2020-09-08  6:37       ` Laurent Pinchart
2020-09-08  6:43         ` Kuninori Morimoto
2020-09-11  7:54         ` Geert Uytterhoeven

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87a6y1rtun.wl-kuninori.morimoto.gx@renesas.com \
    --to=kuninori.morimoto.gx@renesas.com \
    --cc=airlied@linux.ie \
    --cc=daniel@ffwll.ch \
    --cc=devicetree@vger.kernel.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=geert+renesas@glider.be \
    --cc=kieran.bingham+renesas@ideasonboard.com \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-renesas-soc@vger.kernel.org \
    --cc=magnus.damm@gmail.com \
    --cc=robh+dt@kernel.org \
    --cc=yoshihiro.shimoda.uh@renesas.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).