85 lines
2.4 KiB
Diff
85 lines
2.4 KiB
Diff
|
From 9ee2197b5a3295316241f2f6cdce74d9cfee8b03 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jernej Skrabec <jernej.skrabec@siol.net>
|
||
|
|
Date: Sun, 27 Sep 2020 21:29:01 +0200
|
||
|
|
Subject: [PATCH 264/323] arm64: dts: allwinner: h6: Add DAI node and soundcard
|
||
|
|
for HDMI
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Add the I2S node used by the HDMI 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-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 ff75cba80..1730ca171 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";
|
||
|
|
@@ -633,6 +652,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";
|
||
|
|
@@ -767,6 +799,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.34.0
|
||
|
|
|