alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: "Clément Péron" <peron.clem@gmail.com>
To: Liam Girdwood <lgirdwood@gmail.com>,
	Mark Brown <broonie@kernel.org>, Rob Herring <robh+dt@kernel.org>,
	Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>,
	Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>
Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org,
	"Jernej Skrabec" <jernej.skrabec@siol.net>,
	linux-kernel@vger.kernel.org,
	"Marcus Cooper" <codekipper@gmail.com>,
	linux-sunxi <linux-sunxi@googlegroups.com>,
	"Clément Péron" <peron.clem@gmail.com>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/7] arm: dts: sunxi: h3/h5: Add HDMI audio
Date: Sun, 26 Apr 2020 14:04:37 +0200	[thread overview]
Message-ID: <20200426120442.11560-3-peron.clem@gmail.com> (raw)
In-Reply-To: <20200426120442.11560-1-peron.clem@gmail.com>

From: Marcus Cooper <codekipper@gmail.com>

Add a simple-soundcard to link audio between HDMI and I2S.

Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Marcus Cooper <codekipper@gmail.com>
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
 arch/arm/boot/dts/sunxi-h3-h5.dtsi | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
index 9be13378d4df..3a4262294950 100644
--- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi
+++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
@@ -105,6 +105,25 @@
 		status = "disabled";
 	};
 
+	hdmi_sound: hdmi-sound {
+		compatible = "simple-audio-card";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,name = "allwinner,hdmi";
+		simple-audio-card,mclk-fs = <128>;
+		simple-audio-card,frame-inversion;
+		status = "disabled";
+
+		simple-audio-card,codec {
+			sound-dai = <&hdmi>;
+		};
+
+		simple-audio-card,cpu {
+			sound-dai = <&i2s2>;
+			dai-tdm-slot-num = <2>;
+			dai-tdm-slot-width = <32>;
+		};
+	};
+
 	soc {
 		compatible = "simple-bus";
 		#address-cells = <1>;
@@ -672,6 +691,7 @@
 			dmas = <&dma 27>;
 			resets = <&ccu RST_BUS_I2S2>;
 			dma-names = "tx";
+			allwinner,playback-channels = <8>;
 			status = "disabled";
 		};
 
@@ -806,6 +826,7 @@
 		};
 
 		hdmi: hdmi@1ee0000 {
+			#sound-dai-cells = <0>;
 			compatible = "allwinner,sun8i-h3-dw-hdmi",
 				     "allwinner,sun8i-a83t-dw-hdmi";
 			reg = <0x01ee0000 0x10000>;
-- 
2.20.1


  parent reply	other threads:[~2020-04-26 12:07 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-26 12:04 [RFT PATCH 0/7] Add Allwinner H3/H5/A64 HDMI audio Clément Péron
2020-04-26 12:04 ` [PATCH 1/7] arm: dts: sunxi: h3/h5: Add DAI node for HDMI Clément Péron
2020-04-26 12:04 ` Clément Péron [this message]
2020-04-28  7:58   ` [PATCH 2/7] arm: dts: sunxi: h3/h5: Add HDMI audio Maxime Ripard
2020-04-26 12:04 ` [PATCH 3/7] arm64: dts: allwinner: a64: Add DAI node for HDMI Clément Péron
2020-04-26 12:04 ` [PATCH 4/7] arm64: dts: allwinner: a64: Add HDMI audio Clément Péron
2020-04-28  8:00   ` Maxime Ripard
2020-04-28  8:54     ` Clément Péron
2020-04-28 16:04       ` Maxime Ripard
2020-04-28 16:49         ` Audio sound card name [was [PATCH 4/7] arm64: dts: allwinner: a64: Add HDMI audio] Clément Péron
2020-04-28 16:57           ` Mark Brown
2020-04-28 17:11           ` Robin Murphy
2020-04-29  6:24             ` [linux-sunxi] " Chen-Yu Tsai
2020-04-29  8:17               ` Maxime Ripard
2020-04-29 10:42                 ` Clément Péron
2020-04-29 10:43                 ` Robin Murphy
2020-04-29 10:53                   ` Jernej Škrabec
2020-04-29 11:07                     ` Robin Murphy
2020-04-29 11:46                     ` Maxime Ripard
2020-04-29 11:55                   ` Maxime Ripard
2020-04-29 11:59                   ` Takashi Iwai
2020-04-29 12:05                   ` Mark Brown
2020-04-26 12:04 ` [PATCH 5/7] arm: sun8i: h3: Add HDMI audio to Orange Pi 2 Clément Péron
2020-04-26 12:04 ` [PATCH 6/7] arm: sun8i: h3: Add HDMI audio to Beelink X2 Clément Péron
2020-04-26 12:04 ` [PATCH 7/7] arm64: dts: allwinner: a64: Add HDMI audio to Pine64 Clément Péron

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=20200426120442.11560-3-peron.clem@gmail.com \
    --to=peron.clem@gmail.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=codekipper@gmail.com \
    --cc=devicetree@vger.kernel.org \
    --cc=jernej.skrabec@siol.net \
    --cc=lgirdwood@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sunxi@googlegroups.com \
    --cc=mripard@kernel.org \
    --cc=perex@perex.cz \
    --cc=robh+dt@kernel.org \
    --cc=tiwai@suse.com \
    --cc=wens@csie.org \
    /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).