From 31045df6f5fcdc9f34b5ec9c9fc30c1906c64441 Mon Sep 17 00:00:00 2001
From: jian zhou <jian.zhou@amlogic.com>
Date: Wed, 24 Jan 2024 11:05:09 +0800
Subject: [PATCH] audio: fix crash when hdmi in is connected [1/1]

PD#SWPL-155284

Problem:
fix crash when hdmi in is connected.
root cause:extn module can't get audio bus.

Solution:
put extn node under the audio bus node.

Verify:
t5may301

Change-Id: I7f09c5b2d59814b0cf3edcaee676f29ab9d38131
Signed-off-by: jian zhou <jian.zhou@amlogic.com>
---
 arch/arm64/boot/dts/amlogic/mesont3x.dtsi      | 18 +++++++++---------
 arch/arm64/boot/dts/amlogic/mesont5m.dtsi      | 16 ++++++++--------
 arch/arm64/boot/dts/amlogic/mesont5m_reva.dtsi | 10 +++++++++-
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/mesont3x.dtsi b/arch/arm64/boot/dts/amlogic/mesont3x.dtsi
index 6883bba8b..d7598ef9c 100644
--- a/arch/arm64/boot/dts/amlogic/mesont3x.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesont3x.dtsi
@@ -1340,14 +1340,6 @@
 			status = "okay";
 		};
 
-		extn:extn {
-			compatible = "amlogic, t5m-snd-extn";
-			#sound-dai-cells = <0>;
-			interrupts = <GIC_SPI 42 IRQ_TYPE_EDGE_RISING>;
-			interrupt-names = "irq_frhdmirx";
-			status = "okay";
-		};
-
 		audio_data: audio_data {
 			compatible = "amlogic, audio_data";
 			mem_in_base_cmd = <0x82000020>;
@@ -1420,10 +1412,18 @@
 				status = "okay";
 			};
 
-		pinctrl_audio: pinctrl {
+			pinctrl_audio: pinctrl {
 				compatible = "amlogic, audio-pinctrl";
 				status = "okay";
 			};
+
+			extn:extn {
+				compatible = "amlogic, t5m-snd-extn";
+				#sound-dai-cells = <0>;
+				interrupts = <GIC_SPI 42 IRQ_TYPE_EDGE_RISING>;
+				interrupt-names = "irq_frhdmirx";
+				status = "okay";
+			};
 		};/* end of audiobus*/
 
 		/* eARC */
diff --git a/arch/arm64/boot/dts/amlogic/mesont5m.dtsi b/arch/arm64/boot/dts/amlogic/mesont5m.dtsi
index ac4266124..129612557 100644
--- a/arch/arm64/boot/dts/amlogic/mesont5m.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesont5m.dtsi
@@ -1181,14 +1181,6 @@
 			resets = <&reset RESET_ACODEC>;
 		};
 
-		extn:extn {
-			compatible = "amlogic, t5m-snd-extn";
-			#sound-dai-cells = <0>;
-			interrupts = <GIC_SPI 42 IRQ_TYPE_EDGE_RISING>;
-			interrupt-names = "irq_frhdmirx";
-			status = "okay";
-		};
-
 		audio_data: audio_data {
 			compatible = "amlogic, audio_data";
 			mem_in_base_cmd = <0x82000020>;
@@ -1258,6 +1250,14 @@
 			pinctrl_audio: pinctrl {
 				compatible = "amlogic, audio-pinctrl";
 			};
+
+			extn:extn {
+				compatible = "amlogic, t5m-snd-extn";
+				#sound-dai-cells = <0>;
+				interrupts = <GIC_SPI 42 IRQ_TYPE_EDGE_RISING>;
+				interrupt-names = "irq_frhdmirx";
+				status = "okay";
+			};
 		};/* end of audiobus*/
 
 		vpu: vpu {
diff --git a/arch/arm64/boot/dts/amlogic/mesont5m_reva.dtsi b/arch/arm64/boot/dts/amlogic/mesont5m_reva.dtsi
index d4bf17962..02bff2f89 100644
--- a/arch/arm64/boot/dts/amlogic/mesont5m_reva.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesont5m_reva.dtsi
@@ -1262,6 +1262,14 @@
 			pinctrl_audio: pinctrl {
 				compatible = "amlogic, audio-pinctrl";
 			};
+
+			extn:extn {
+				compatible = "amlogic, t5m-snd-extn";
+				#sound-dai-cells = <0>;
+				interrupts = <GIC_SPI 42 IRQ_TYPE_EDGE_RISING>;
+				interrupt-names = "irq_frhdmirx";
+				status = "okay";
+			};
 		};/* end of audiobus*/
 
 		vpu: vpu {
@@ -1418,7 +1426,7 @@
 			#size-cells = <2>;
 			ranges = <0x0 0x0 0x0 0xfe333000 0x0 0x1000>;
 			earc: earc@0 {
-				compatible = "amlogic, t3-snd-earc";
+				compatible = "amlogic, t5m-snd-earc";
 				#sound-dai-cells = <0>;
 
 				status = "disabled";