From 0af41814b25ee37a0a7d36fee11b6fb96fb322af Mon Sep 17 00:00:00 2001
From: Luke go <sangch.go@gmail.com>
Date: Wed, 9 Dec 2020 17:38:21 +0900
Subject: [PATCH] ODROID-C4: arm64/dts: audio: Remove spdifb.

- ODROID-C4 does not use the spdifb.

Change-Id: I326f46c221c6e4ab5593b52de0c47c15ee28e7d5
---
 .../boot/dts/amlogic/meson64_odroidc4.dts     | 27 +++++++------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts
index 3173ebc44a0c..256d01200251 100644
--- a/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts
+++ b/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts
@@ -641,8 +641,10 @@
 		compatible = "amlogic, aml_codec_T9015";
 		reg = <0x0 0xFF632000 0x0 0x2000>;
 		is_auge_used = <1>; /* meson or auge chipset used */
-		tocodec_inout = <0>;
+		tocodec_inout = <1>;
 		tdmout_index = <2>;
+		ch0_sel = <0>;
+		ch1_sel = <1>;
 		status = "okay";
 	};
 	audio_effect:eqdrc{
@@ -665,9 +667,7 @@
 		compatible = "amlogic, g12a-sound-card";
 		aml-audio-card,name = "AML-AUGESOUND";
 
-		/*avout mute gpio*/
-		avout_mute-gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>;
-
+		/* ODROID-C4: spdif_out GPIOAO_10(J7.2), HDMI out*/
 		aml-audio-card,dai-link@0 {
 			mclk-fs = <128>;
 			continuous-clock;
@@ -681,12 +681,13 @@
 			};
 		};
 
+		/* ODROID-C4: Line-out(J4) */
 		aml-audio-card,dai-link@1 {
 			format = "i2s";
 			mclk-fs = <256>;
+			continuous-clock;
 			bitclock-master = <&tdmc>;
 			frame-master = <&tdmc>;
-			continuous-clock;
 			suffix-name = "alsaPORT-i2s";
 			cpu {
 				sound-dai = <&tdmc>;
@@ -701,15 +702,18 @@
 			};
 		};
 
+		/* ODROID-C4: I2S out(J7) */
 		aml-audio-card,dai-link@2 {
 			format = "i2s";
 			mclk-fs = <256>;
+			continuous-clock;
 			bitclock-master = <&tdmb>;
 			frame-master = <&tdmb>;
 			suffix-name = "alsaPORT-i2s1";
 			cpu {
 				sound-dai = <&tdmb>;
 				dai-tdm-slot-tx-mask = <1 1>;
+				dai-tdm-slot-rx-mask = <1 1>;
 				dai-tdm-slot-num = <2>;
 				dai-tdm-slot-width = <32>;
 				system-clock-frequency = <12288000>;
@@ -784,7 +788,7 @@
 		clocks = <&clkaudio CLKID_AUDIO_MCLK_C
 				&clkc CLKID_MPLL2>;
 		clock-names = "mclk", "clk_srcpll";
-		i2s2hdmi = <1>;
+		i2s2hdmi = <0>;
 		status = "okay";
 	};
 
@@ -806,17 +810,6 @@
 		pinctrl-names = "spdif_pins";
 		pinctrl-0 = <&spdifout>;
 
-		status = "okay";
-	};
-	spdifb: spdif@1 {
-		compatible = "amlogic, sm1-snd-spdif-b";
-		#sound-dai-cells = <0>;
-		clocks = <&clkc CLKID_MPLL0 /*CLKID_HIFI_PLL*/
-				&clkaudio CLKID_AUDIO_GATE_SPDIFOUT_B
-				&clkaudio CLKID_AUDIO_SPDIFOUT_B>;
-		clock-names = "sysclk",
-				"gate_spdifout", "clk_spdifout";
-
 		status = "okay";
 	};
 }; /* end of audiobus */