dts: enable hdmi sound

3 files changed, 60 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 52878aa809ae..8b49a054e027 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-tqc-a01
 	pkgver = 5.11.4
-	pkgrel = 5
+	pkgrel = 6
 	url = http://www.kernel.org/
 	arch = aarch64
 	license = GPL2
@@ -17,6 +17,7 @@ pkgbase = linux-tqc-a01
 	source = http://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz
 	source = sun50i-h6-tqc-a01.dts
 	source = 0001-mfd-Add-support-for-AC200.patch
+	source = 0001-HACK-h6-Add-HDMI-sound-card.patch
 	source = 0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
 	source = 0002-net-phy-Add-support-for-AC200-EPHY.patch
 	source = 0002-net-stmmac-sun8i-Use-devm_regulator_get-for-PHY-regu.patch
@@ -39,6 +40,7 @@ pkgbase = linux-tqc-a01
 	md5sums = d2985a3f16ef1ea3405c04c406e29dcc
 	md5sums = f5de0dfcddc871280a60d99ea3284317
 	md5sums = 17aa0c69176c68cd98b4522740a1b747
+	md5sums = 2285d81ec6fb859d34b7abfd46a59550
 	md5sums = f9b6f367eef351eaa89b23a9b1ffc5a2
 	md5sums = bc7904920675ba8d38f21d46ffac33b5
 	md5sums = 94a69594f90309c50c83a5cc8579fb54
diff --git a/0001-HACK-h6-Add-HDMI-sound-card.patch b/0001-HACK-h6-Add-HDMI-sound-card.patch
new file mode 100644
index 000000000000..71663f441cac
--- /dev/null
+++ b/0001-HACK-h6-Add-HDMI-sound-card.patch
@@ -0,0 +1,53 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jernej Skrabec <jernej.skrabec@siol.net>
+Date: Sat, 16 Jan 2021 10:58:14 +0100
+Subject: [PATCH] HACK: h6: Add HDMI sound card
+
+Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
+---
+ arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 20 +++++++++++++++++++-
+ 1 file changed, 19 insertions(+), 1 deletion(-)
+
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
+@@ -108,6 +108,24 @@
+ 			(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
+ 	};
+ 
++	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 = <&i2s1>;
++			dai-tdm-slot-num = <2>;
++			dai-tdm-slot-width = <32>;
++		};
++	};
++
+ 	soc {
+ 		compatible = "simple-bus";
+ 		#address-cells = <1>;
+@@ -652,7 +670,6 @@
+ 			dmas = <&dma 4>, <&dma 4>;
+ 			resets = <&ccu RST_BUS_I2S1>;
+ 			dma-names = "rx", "tx";
+-			status = "disabled";
+ 		};
+ 
+ 		spdif: spdif@5093000 {
+@@ -785,6 +802,7 @@
+ 		};
+ 
+ 		hdmi: hdmi@6000000 {
++			#sound-dai-cells = <0>;
+ 			compatible = "allwinner,sun50i-h6-dw-hdmi";
+ 			reg = <0x06000000 0x10000>;
+ 			reg-io-width = <1>;
diff --git a/PKGBUILD b/PKGBUILD
index ed1235a605c8..9b29a986ce57 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ _srcname=linux-5.11
 _kernelname=${pkgbase#linux}
 _desc="AArch64 kernel for TQC A01"
 pkgver=5.11.4
-pkgrel=5
+pkgrel=6
 arch=('aarch64')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -19,6 +19,7 @@ options=('!strip')
 source=("http://cdn.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz"
         'sun50i-h6-tqc-a01.dts'
         '0001-mfd-Add-support-for-AC200.patch'
+        '0001-HACK-h6-Add-HDMI-sound-card.patch'
         '0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch'
         '0002-net-phy-Add-support-for-AC200-EPHY.patch'
         '0002-net-stmmac-sun8i-Use-devm_regulator_get-for-PHY-regu.patch'
@@ -44,6 +45,7 @@ source+=("https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz")
 md5sums=('d2985a3f16ef1ea3405c04c406e29dcc'
          'f5de0dfcddc871280a60d99ea3284317'
          '17aa0c69176c68cd98b4522740a1b747'
+         '2285d81ec6fb859d34b7abfd46a59550'
          'f9b6f367eef351eaa89b23a9b1ffc5a2'
          'bc7904920675ba8d38f21d46ffac33b5'
          '94a69594f90309c50c83a5cc8579fb54'
@@ -73,6 +75,7 @@ prepare() {
 
   # patches for TQC A01
   patch -p1 < ../0001-mfd-Add-support-for-AC200.patch
+  patch -p1 < ../0001-HACK-h6-Add-HDMI-sound-card.patch
   patch -p1 < ../0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
   patch -p1 < ../0002-net-phy-Add-support-for-AC200-EPHY.patch
   patch -p1 < ../0002-net-stmmac-sun8i-Use-devm_regulator_get-for-PHY-regu.patch