68 lines
1.9 KiB
Diff
68 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jernej Skrabec <jernej.skrabec@siol.net>
|
|
Date: Sun, 16 Aug 2020 11:01:11 +0200
|
|
Subject: [PATCH] r40 hdmi audio wip
|
|
|
|
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
|
|
---
|
|
arch/arm/boot/dts/sun8i-r40.dtsi | 32 ++++++++++++++++++++++++++++++++
|
|
1 file changed, 32 insertions(+)
|
|
|
|
diff --git a/arch/arm/boot/dts/sun8i-r40.dtsi b/arch/arm/boot/dts/sun8i-r40.dtsi
|
|
index 82a4ee50e4d0..ed3bb5778fcb 100644
|
|
--- a/arch/arm/boot/dts/sun8i-r40.dtsi
|
|
+++ b/arch/arm/boot/dts/sun8i-r40.dtsi
|
|
@@ -111,6 +111,24 @@ de: display-engine {
|
|
status = "disabled";
|
|
};
|
|
|
|
+ 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;
|
|
+
|
|
+ simple-audio-card,codec {
|
|
+ sound-dai = <&hdmi>;
|
|
+ };
|
|
+
|
|
+ simple-audio-card,cpu {
|
|
+ sound-dai = <&i2s2>;
|
|
+ dai-tdm-slot-num = <2>;
|
|
+ dai-tdm-slot-width = <32>;
|
|
+ };
|
|
+ };
|
|
+
|
|
thermal-zones {
|
|
cpu_thermal: cpu0-thermal {
|
|
/* milliseconds */
|
|
@@ -666,6 +684,19 @@ wdt: watchdog@1c20c90 {
|
|
clocks = <&osc24M>;
|
|
};
|
|
|
|
+ i2s2: i2s@1c22800 {
|
|
+ #sound-dai-cells = <0>;
|
|
+ compatible = "allwinner,sun8i-r40-i2s",
|
|
+ "allwinner,sun8i-h3-i2s";
|
|
+ reg = <0x01c22800 0x400>;
|
|
+ interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>;
|
|
+ clocks = <&ccu CLK_BUS_I2S2>, <&ccu CLK_I2S2>;
|
|
+ clock-names = "apb", "mod";
|
|
+ resets = <&ccu RST_BUS_I2S2>;
|
|
+ dmas = <&dma 6>, <&dma 6>;
|
|
+ dma-names = "rx", "tx";
|
|
+ };
|
|
+
|
|
ir0: ir@1c21800 {
|
|
compatible = "allwinner,sun8i-r40-ir",
|
|
"allwinner,sun6i-a31-ir";
|
|
@@ -1142,6 +1173,7 @@ gic: interrupt-controller@1c81000 {
|
|
};
|
|
|
|
hdmi: hdmi@1ee0000 {
|
|
+ #sound-dai-cells = <0>;
|
|
compatible = "allwinner,sun8i-r40-dw-hdmi",
|
|
"allwinner,sun8i-a83t-dw-hdmi";
|
|
reg = <0x01ee0000 0x10000>;
|