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>,
"Jaroslav Kysela" <perex@perex.cz>,
"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 v5 12/20] arm64: dts: allwinner: a64: Add DAI node and soundcard for HDMI
Date: Sun, 27 Sep 2020 21:29:04 +0200 [thread overview]
Message-ID: <20200927192912.46323-13-peron.clem@gmail.com> (raw)
In-Reply-To: <20200927192912.46323-1-peron.clem@gmail.com>
From: Marcus Cooper <codekipper@gmail.com>
Add the new DAI block for I2S2 which is used for HDMI audio
and a simple-soundcard to link audio between HDMI and I2S.
Note that the HDMI codec requires an inverted frame clock and
a fixed I2S width. As there is no such option for I2S we use
TDM property of the simple-soundcard to do that.
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-a64.dtsi | 34 +++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
index dc238814013c..ba8a84e6e993 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
@@ -102,6 +102,25 @@ de: display-engine {
status = "disabled";
};
+ hdmi_sound: hdmi-sound {
+ compatible = "simple-audio-card";
+ simple-audio-card,format = "i2s";
+ simple-audio-card,name = "sun50i-a64-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>;
+ };
+ };
+
osc24M: osc24M_clk {
#clock-cells = <0>;
compatible = "fixed-clock";
@@ -846,6 +865,20 @@ i2s1: i2s@1c22400 {
status = "disabled";
};
+ i2s2: i2s@1c22800 {
+ #sound-dai-cells = <0>;
+ compatible = "allwinner,sun50i-a64-i2s",
+ "allwinner,sun8i-h3-i2s";
+ reg = <0x01c22800 0x400>;
+ interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&ccu CLK_BUS_I2S2>, <&ccu CLK_I2S2>;
+ clock-names = "apb", "mod";
+ resets = <&ccu RST_BUS_I2S2>;
+ dma-names = "rx", "tx";
+ dmas = <&dma 27>, <&dma 27>;
+ status = "disabled";
+ };
+
dai: dai@1c22c00 {
#sound-dai-cells = <0>;
compatible = "allwinner,sun50i-a64-codec-i2s";
@@ -1143,6 +1176,7 @@ deinterlace: deinterlace@1e00000 {
};
hdmi: hdmi@1ee0000 {
+ #sound-dai-cells = <0>;
compatible = "allwinner,sun50i-a64-dw-hdmi",
"allwinner,sun8i-a83t-dw-hdmi";
reg = <0x01ee0000 0x10000>;
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-09-27 19:33 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-27 19:28 [PATCH v5 00/20] Add Allwinner H3/H5/H6/A64 HDMI audio Clément Péron
2020-09-27 19:28 ` [PATCH v5 01/20] ASoC: sun4i-i2s: Add support for H6 I2S Clément Péron
2020-09-28 4:40 ` [linux-sunxi] " Chen-Yu Tsai
2020-09-28 14:37 ` Clément Péron
2020-09-28 14:46 ` Chen-Yu Tsai
2020-09-27 19:28 ` [PATCH v5 02/20] ASoC: sun4i-i2s: Change set_chan_cfg() params Clément Péron
2020-09-28 5:00 ` [linux-sunxi] " Chen-Yu Tsai
2020-09-28 14:48 ` Clément Péron
2020-09-27 19:28 ` [PATCH v5 03/20] ASoC: sun4i-i2s: Change get_sr() and get_wss() to be more explicit Clément Péron
2020-09-28 4:37 ` [linux-sunxi] " Chen-Yu Tsai
2020-09-28 5:02 ` Chen-Yu Tsai
2020-09-27 19:28 ` [PATCH v5 04/20] dt-bindings: ASoC: sun4i-i2s: Add H6 compatible Clément Péron
2020-09-28 5:03 ` [linux-sunxi] " Chen-Yu Tsai
2020-09-27 19:28 ` [PATCH v5 05/20] ASoC: sun4i-i2s: Set sign extend sample Clément Péron
2020-09-28 6:52 ` [linux-sunxi] " Chen-Yu Tsai
2020-09-27 19:28 ` [PATCH v5 06/20] ASoc: sun4i-i2s: Add 20 and 24 bit support Clément Péron
2020-09-28 6:51 ` [linux-sunxi] " Chen-Yu Tsai
2020-09-27 19:28 ` [PATCH v5 07/20] ASoC: sun4i-i2s: Fix sun8i volatile regs Clément Péron
2020-09-28 6:49 ` [linux-sunxi] " Chen-Yu Tsai
2020-09-27 19:29 ` [PATCH v5 08/20] ASoC: sun4i-i2s: Fix setting of FIFO modes Clément Péron
2020-09-28 6:51 ` [linux-sunxi] " Chen-Yu Tsai
2020-09-27 19:29 ` [PATCH v5 09/20] arm64: dts: allwinner: h6: Add DAI node and soundcard for HDMI Clément Péron
2020-09-28 5:32 ` [linux-sunxi] " Chen-Yu Tsai
2020-09-28 5:42 ` Chen-Yu Tsai
2020-10-02 16:01 ` Clément Péron
2020-10-02 16:24 ` Maxime Ripard
2020-10-03 9:32 ` Clément Péron
2020-09-27 19:29 ` [PATCH v5 10/20] arm64: dts: allwinner: h6: Enable HDMI sound for Beelink GS1 Clément Péron
2020-09-28 5:32 ` [linux-sunxi] " Chen-Yu Tsai
2020-09-27 19:29 ` [PATCH v5 11/20] arm: dts: sunxi: h3/h5: Add DAI node and soundcard for HDMI Clément Péron
2020-09-27 19:29 ` Clément Péron [this message]
2020-09-27 19:29 ` [PATCH v5 13/20] arm: sun8i: h3: Add HDMI audio to Orange Pi 2 Clément Péron
2020-09-27 19:29 ` [PATCH v5 14/20] arm: sun8i: h3: Add HDMI audio to Beelink X2 Clément Péron
2020-09-27 19:29 ` [PATCH v5 15/20] arm64: dts: allwinner: a64: Add HDMI audio to Pine64 Clément Péron
2020-09-27 19:29 ` [PATCH v5 16/20] arm64: dts: allwinner: Enable HDMI audio on Orange Pi PC 2 Clément Péron
2020-09-27 19:29 ` [PATCH v5 17/20] ARM: dts: sun8i-h3: Enable HDMI audio on Orange Pi PC/One Clément Péron
2020-09-27 19:29 ` [PATCH v5 18/20] arm64: dts: sun50i-h6-orangepi-3: Enable HDMI audio Clément Péron
2020-09-27 19:29 ` [PATCH v5 19/20] arm64: defconfig: Enable Allwinner i2s driver Clément Péron
2020-09-27 19:29 ` [PATCH v5 20/20] ASoC: sun4i-i2s: fix coding-style for callback definition Clément Péron
2020-09-28 6:52 ` [linux-sunxi] [PATCH v5 00/20] Add Allwinner H3/H5/H6/A64 HDMI audio Chen-Yu Tsai
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=20200927192912.46323-13-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).