From: ckkim <changkon12@gmail.com>
Date: Wed, 4 Nov 2020 03:15:28 +0000 (+0900)
Subject: ODROID-N2/N2+:no soundcard error fix.
X-Git-Tag: hardkernel-4.9.236-104~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=800070774d40124984fa6a654854c93c6f78da3c;p=platform%2Fkernel%2Flinux-amlogic.git

ODROID-N2/N2+:no soundcard error fix.

Change-Id: I71319cf50a1fd07b9ec48edc62e2a0bbcf565ba9
---

diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dtsi b/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dtsi
index 3c060e1ed5cd..5ebc87532437 100644
--- a/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dtsi
@@ -426,9 +426,7 @@
 				&clkaudio CLKID_AUDIO_SPDIFOUTB_CTRL>;
 		clock-names = "sysclk",
 				"gate_spdifout", "clk_spdifout";
-		pinctrl-names = "spdif_pins";
-		pinctrl-0 = <&spdifout_b>;
-		status = "disabled";
+		status = "okay";
 	};
 	aml_loopback: loopback {
 		compatible = "amlogic, snd-loopback";
@@ -574,12 +572,6 @@
 			function = "spdif_out";
 		};
 	};
-	spdifout_b: spdifout_b {
-		mux {/* GPIOA_13 */
-			groups = "spdif_out_a13";
-			function = "spdif_out";
-		};
-	};
 }; /* end of pinctrl_periphs */
 
 &pinctrl_aobus {
diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/gpio_spdif.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/gpio_spdif.dts
index c6a599613954..74585ed8d90f 100644
--- a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/gpio_spdif.dts
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/gpio_spdif.dts
@@ -4,10 +4,13 @@
 / {
 	fragment@0 {
 		// GPIOA 13
-		target = <&aml_spdif>;
+		target = <&spdifout>;
 
 		__overlay__ {
-			pinctrl-0 = <&spdifout_b>;
+			mux {/* GPIOA_13 */
+				groups = "spdif_out_a13";
+				function = "spdif_out";
+			};
 		};
 	};
 };