From 8fffd69a36ca6a3d4dbcd36ddd9ed9a47390560a Mon Sep 17 00:00:00 2001
From: tonymac32 <tonymckahan@gmail.com>
Date: Thu, 14 Dec 2017 01:36:34 -0500
Subject: [PATCH] DTS Nanopi K2 HDMI Audio

---
 .../1030_GXBB_NanoPi_K2_DTS_HDMI_sound.patch  | 97 +++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 patch/kernel/meson64-next/1030_GXBB_NanoPi_K2_DTS_HDMI_sound.patch

diff --git a/patch/kernel/meson64-next/1030_GXBB_NanoPi_K2_DTS_HDMI_sound.patch b/patch/kernel/meson64-next/1030_GXBB_NanoPi_K2_DTS_HDMI_sound.patch
new file mode 100644
index 0000000000..668523184a
--- /dev/null
+++ b/patch/kernel/meson64-next/1030_GXBB_NanoPi_K2_DTS_HDMI_sound.patch
@@ -0,0 +1,97 @@
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
+index df0c883..d741d5e 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
+@@ -170,6 +170,38 @@
+ 		};
+ 	};
+ 
++	sound {
++		compatible = "simple-audio-card";
++		simple-audio-card,name = "meson-gx-preview";
++		status = "okay";
++
++		simple-audio-card,dai-link@0 {
++			/* HDMI Output */
++			format = "i2s";
++			mclk-fs = <256>;
++			bitclock-master =  <&i2s_dai>;
++			frame-master = <&i2s_dai>;
++			plat {
++				sound-dai = <&aiu_i2s_dma>;
++			};
++
++			cpu {
++				sound-dai = <&i2s_dai>;
++			};
++
++			codec {
++				sound-dai = <&hdmi_tx>;
++			};
++		};
++	};
++};
++
++&audio {
++	status = "okay";
++};
++
++&aiu_i2s_dma {
++	status = "okay";
+ };
+ 
+ &cec_AO {
+@@ -223,6 +255,10 @@
+ 	pinctrl-names = "default";
+ };
+ 
++&i2s_dai {
++	status = "okay";
++};
++
+ &pinctrl_aobus {
+ 	gpio-line-names = "UART TX", "UART RX", "Power Control", "Power Key In",
+ 			  "VCCK En", "CON1 Header Pin31",
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+index b5b6b33..281abdf 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+@@ -337,6 +337,7 @@
+ 		 <&clkc CLKID_CLK81>,
+ 		 <&clkc CLKID_GCLK_VENCI_INT0>;
+ 	clock-names = "isfr", "iahb", "venci";
++	#sound-dai-cells = <0>;
+ };
+ 
+ &hiubus {
+@@ -734,6 +735,29 @@
+ 			       <0>; /* Do Nothing */
+ };
+ 
++&audio {
++	clocks = <&clkc CLKID_AIU>,
++		 <&clkc CLKID_AIU_GLUE>,
++		 <&clkc CLKID_I2S_SPDIF>;
++	clock-names = "aiu_top", "aiu_glue", "audin";
++	resets = <&reset RESET_AIU>,
++		 <&reset RESET_AUDIN>;
++	reset-names = "aiu", "audin";
++};
++
++&aiu_i2s_dma {
++	clocks = <&clkc CLKID_I2S_OUT>;
++	clock-names = "fast";
++};
++
++&i2s_dai {
++	clocks = <&clkc CLKID_I2S_OUT>,
++		 <&clkc CLKID_MIXER_IFACE>,
++		 <&clkc CLKID_AOCLK_GATE>,
++		 <&clkc CLKID_CTS_AMCLK>;
++	clock-names = "fast", "iface", "bclks", "mclk";
++};
++
+ &saradc {
+ 	compatible = "amlogic,meson-gxbb-saradc", "amlogic,meson-saradc";
+ 	clocks = <&xtal>,
+