From: "Clément Péron" <peron.clem@gmail.com>
To: Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>,
Rob Herring <robh+dt@kernel.org>, Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>
Cc: devicetree@vger.kernel.org,
"Jernej Skrabec" <jernej.skrabec@siol.net>,
alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org,
"Takashi Iwai" <tiwai@suse.com>,
"Marcus Cooper" <codekipper@gmail.com>,
linux-sunxi@googlegroups.com,
"Clément Péron" <peron.clem@gmail.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 07/19] arm64: dts: allwinner: h6: Add HDMI audio node
Date: Sun, 20 Sep 2020 20:07:46 +0200 [thread overview]
Message-ID: <20200920180758.592217-8-peron.clem@gmail.com> (raw)
In-Reply-To: <20200920180758.592217-1-peron.clem@gmail.com>
From: Jernej Skrabec <jernej.skrabec@siol.net>
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/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 33 ++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
index 28c77d6872f6..a8853ee7885a 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
@@ -67,6 +67,25 @@ de: display-engine {
status = "disabled";
};
+ hdmi_sound: hdmi-sound {
+ compatible = "simple-audio-card";
+ simple-audio-card,format = "i2s";
+ simple-audio-card,name = "sun50i-h6-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 = <&i2s1>;
+ dai-tdm-slot-num = <2>;
+ dai-tdm-slot-width = <32>;
+ };
+ };
+
osc24M: osc24M_clk {
#clock-cells = <0>;
compatible = "fixed-clock";
@@ -609,6 +628,19 @@ mdio: mdio {
};
};
+ i2s1: i2s@5091000 {
+ #sound-dai-cells = <0>;
+ compatible = "allwinner,sun50i-h6-i2s";
+ reg = <0x05091000 0x1000>;
+ interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&ccu CLK_BUS_I2S1>, <&ccu CLK_I2S1>;
+ clock-names = "apb", "mod";
+ dmas = <&dma 4>, <&dma 4>;
+ resets = <&ccu RST_BUS_I2S1>;
+ dma-names = "rx", "tx";
+ status = "disabled";
+ };
+
spdif: spdif@5093000 {
#sound-dai-cells = <0>;
compatible = "allwinner,sun50i-h6-spdif";
@@ -739,6 +771,7 @@ ohci3: usb@5311400 {
};
hdmi: hdmi@6000000 {
+ #sound-dai-cells = <0>;
compatible = "allwinner,sun50i-h6-dw-hdmi";
reg = <0x06000000 0x10000>;
reg-io-width = <1>;
--
2.25.1
next prev parent reply other threads:[~2020-09-20 18:13 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-20 18:07 [PATCH v3 00/19] Add Allwinner H3/H5/H6/A64 HDMI audio Clément Péron
2020-09-20 18:07 ` [PATCH v3 01/19] ASoC: sun4i-i2s: Add support for H6 I2S Clément Péron
2020-09-20 18:39 ` Samuel Holland
2020-09-20 19:38 ` Clément Péron
2020-09-20 18:07 ` [PATCH v3 02/19] ASoC: sun4i-i2s: Change set_chan_cfg params Clément Péron
2020-09-20 18:07 ` [PATCH v3 03/19] dt-bindings: ASoC: sun4i-i2s: Add H6 compatible Clément Péron
2020-09-20 18:07 ` [PATCH v3 04/19] ASoC: sun4i-i2s: Set sign extend sample Clément Péron
2020-09-20 18:07 ` [PATCH v3 05/19] ASoc: sun4i-i2s: Add 20 and 24 bit support Clément Péron
2020-09-20 18:45 ` Samuel Holland
2020-09-20 21:32 ` Clément Péron
2020-09-20 18:07 ` [PATCH v3 06/19] ASoC: sun4i-i2s: Fix sun8i volatile regs Clément Péron
2020-09-20 18:52 ` Samuel Holland
2020-09-20 20:05 ` Clément Péron
2020-09-20 18:07 ` Clément Péron [this message]
2020-09-20 18:07 ` [PATCH v3 08/19] arm64: dts: allwinner: h6: Enable HDMI sound for Beelink GS1 Clément Péron
2020-09-20 18:07 ` [PATCH v3 09/19] arm: dts: sunxi: h3/h5: Add DAI node for HDMI Clément Péron
2020-09-20 18:07 ` [PATCH v3 10/19] arm: dts: sunxi: h3/h5: Add HDMI audio Clément Péron
2020-09-20 18:07 ` [PATCH v3 11/19] arm64: dts: allwinner: a64: Add DAI node for HDMI Clément Péron
2020-09-20 18:07 ` [PATCH v3 12/19] arm64: dts: allwinner: a64: Add HDMI audio Clément Péron
2020-09-20 18:07 ` [PATCH v3 13/19] arm: sun8i: h3: Add HDMI audio to Orange Pi 2 Clément Péron
2020-09-20 18:07 ` [PATCH v3 14/19] arm: sun8i: h3: Add HDMI audio to Beelink X2 Clément Péron
2020-09-20 18:07 ` [PATCH v3 15/19] arm64: dts: allwinner: a64: Add HDMI audio to Pine64 Clément Péron
2020-09-20 18:07 ` [PATCH v3 16/19] arm64: dts: allwinner: Enable HDMI audio on Orange Pi PC 2 Clément Péron
2020-09-20 18:07 ` [PATCH v3 17/19] ARM: dts: sun8i-h3: Enable HDMI audio on Orange Pi PC/One Clément Péron
2020-09-20 18:07 ` [PATCH v3 18/19] arm64: dts: sun50i-h6-orangepi-3: Enable HDMI audio Clément Péron
2020-09-20 18:07 ` [PATCH v3 19/19] arm64: defconfig: Enable Allwinner i2s driver 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=20200920180758.592217-8-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=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).