85 lines
2.4 KiB
Diff
85 lines
2.4 KiB
Diff
From 3a5db659f8a1932d1a4357210fb836e13193a170 Mon Sep 17 00:00:00 2001
|
|
From: Marcus Cooper <codekipper@gmail.com>
|
|
Date: Sun, 27 Sep 2020 21:29:03 +0200
|
|
Subject: [PATCH 266/323] arm: dts: sunxi: h3/h5: Add DAI node and soundcard
|
|
for HDMI
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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/arm/boot/dts/sunxi-h3-h5.dtsi | 33 ++++++++++++++++++++++++++++++
|
|
1 file changed, 33 insertions(+)
|
|
|
|
diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
|
|
index 66c2f2013..50437ad5b 100644
|
|
--- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi
|
|
+++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
|
|
@@ -112,6 +112,25 @@ scpi_protocol: scpi {
|
|
shmem = <&scpi_sram>;
|
|
};
|
|
|
|
+ hdmi_sound: hdmi-sound {
|
|
+ compatible = "simple-audio-card";
|
|
+ simple-audio-card,format = "i2s";
|
|
+ simple-audio-card,name = "sun8i-h3-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>;
|
|
@@ -670,6 +689,19 @@ i2s1: i2s@1c22400 {
|
|
status = "disabled";
|
|
};
|
|
|
|
+ i2s2: i2s@1c22800 {
|
|
+ #sound-dai-cells = <0>;
|
|
+ compatible = "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";
|
|
+ dmas = <&dma 27>, <&dma 27>;
|
|
+ resets = <&ccu RST_BUS_I2S2>;
|
|
+ dma-names = "rx", "tx";
|
|
+ status = "disabled";
|
|
+ };
|
|
+
|
|
codec: codec@1c22c00 {
|
|
#sound-dai-cells = <0>;
|
|
compatible = "allwinner,sun8i-h3-codec";
|
|
@@ -801,6 +833,7 @@ csi: camera@1cb0000 {
|
|
};
|
|
|
|
hdmi: hdmi@1ee0000 {
|
|
+ #sound-dai-cells = <0>;
|
|
compatible = "allwinner,sun8i-h3-dw-hdmi",
|
|
"allwinner,sun8i-a83t-dw-hdmi";
|
|
reg = <0x01ee0000 0x10000>;
|
|
--
|
|
2.34.0
|
|
|