From: Nick Xie <nick@khadas.com>
Date: Wed, 3 Jul 2019 09:52:13 +0000 (+0800)
Subject: sound: fixup sound card
X-Git-Tag: khadas-vims-v0.9.6-release~587
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=527ef4bfd730d58c2218f7a5ba5917c38d7a236d;p=platform%2Fkernel%2Flinux-amlogic.git

sound: fixup sound card

Signed-off-by: Nick Xie <nick@khadas.com>
---

diff --git a/arch/arm64/boot/dts/amlogic/kvim3_linux.dts b/arch/arm64/boot/dts/amlogic/kvim3_linux.dts
index 056c53b..621ea29 100644
--- a/arch/arm64/boot/dts/amlogic/kvim3_linux.dts
+++ b/arch/arm64/boot/dts/amlogic/kvim3_linux.dts
@@ -476,7 +476,7 @@
 	};
 	dummy_codec:dummy{
 		#sound-dai-cells = <0>;
-		compatible = "amlogic, aml_dummy_codec";
+		compatible = "linux,spdif-dit";
 		status = "okay";
 	};
 	amlogic_codec:t9015{
@@ -509,8 +509,6 @@
 
 		//aml-audio-card,loopback = <&aml_loopback>;
 		//aml-audio-card,aux-devs = <&amlogic_codec>;
-		/*avout mute gpio*/
-		//avout_mute-gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>;
 		/*for audio effect ,eqdrc */
 		aml-audio-card,effect = <&audio_effect>;
 
@@ -955,7 +953,7 @@
 		interrupt-names = "irq_spdifin";
 		pinctrl-names = "spdif_pins",
 					"spdif_pins_mute";
-		pinctrl-0 = <&spdifout &spdifin>;
+		pinctrl-0 = <&spdifout>;
 		pinctrl-1 = <&spdifout_a_mute>;
 		status = "okay";
 	};
@@ -1142,21 +1140,6 @@
 		};
 	};
 
-	spdifin: spdifin {
-		mux {/* GPIOH_5 */
-			groups = "spdif_in_h";
-			function = "spdif_in";
-		};
-	};
-
-	/* GPIOH_4 */
-	spdifout: spdifout {
-		mux {
-			groups = "spdif_out_h";
-			function = "spdif_out";
-		};
-	};
-
 	pdmin: pdmin {
 		mux { /* gpioa_5, gpioa_6, gpioa_7, gpioa_8, gpioa_9*/
 			groups = "pdm_din0_a",
@@ -1170,6 +1153,12 @@
 }; /* end of pinctrl_periphs */
 
 &pinctrl_aobus {
+	spdifout: spdifout {
+		mux { /* gpiao_10 */
+			groups = "spdif_out_ao";
+			function = "spdif_out_ao";
+		};
+	};
 	spdifout_a_mute: spdifout_a_mute {
 		mux { /* gpiao_10 */
 			groups = "GPIOAO_10";
diff --git a/arch/arm64/configs/kvims_defconfig b/arch/arm64/configs/kvims_defconfig
index 37f4b7f..f4f174b 100644
--- a/arch/arm64/configs/kvims_defconfig
+++ b/arch/arm64/configs/kvims_defconfig
@@ -530,6 +530,7 @@ CONFIG_SND_PCM_OSS=y
 CONFIG_SND_SEQUENCER_OSS=y
 CONFIG_SND_USB_AUDIO=y
 CONFIG_SND_SOC=y
+CONFIG_SND_SOC_SPDIF=y
 CONFIG_AMLOGIC_SND_SOC_CODECS=y
 CONFIG_AMLOGIC_SND_CODEC_DUMMY_CODEC=y
 CONFIG_AMLOGIC_SND_CODEC_PCM2BT=y