From fed98aeb1e89e305f16f8b690c715f0b9958f364 Mon Sep 17 00:00:00 2001
From: Kunlei Zhang <quic_kunleiz@quicinc.com>
Date: Wed, 8 May 2024 15:21:09 +0800
Subject: [PATCH 1/2] ARM: dts: msm: disable AATC on Pakala HDK device

Disable AATC on Pakala HDK device.

Change-Id: I32af8c3e44d3259700cefad32d824ece4b4c10f4
Signed-off-by: Kunlei Zhang <quic_kunleiz@quicinc.com>
---
 sun-audio-hdk.dts  |  2 +-
 sun-audio-hdk.dtsi | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 sun-audio-hdk.dtsi

diff --git a/sun-audio-hdk.dts b/sun-audio-hdk.dts
index d78bb014..a8ce2b7e 100644
--- a/sun-audio-hdk.dts
+++ b/sun-audio-hdk.dts
@@ -6,7 +6,7 @@
 /dts-v1/;
 /plugin/;
 
-#include "sun-audio-qrd.dtsi"
+#include "sun-audio-hdk.dtsi"
  / {
 	model = "Qualcomm Technologies, Inc. SunP QRD HDK";
 	compatible = "qcom,sunp-hdk", "qcom,sunp", "qcom,hdk";
diff --git a/sun-audio-hdk.dtsi b/sun-audio-hdk.dtsi
new file mode 100644
index 00000000..0a46c1af
--- /dev/null
+++ b/sun-audio-hdk.dtsi
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include "sun-audio-qrd.dtsi"
+
+&sun_snd {
+	qcom,model = "sun-qrd-snd-card";
+
+	qcom,msm-mbhc-usbc-audio-supported = <0>;
+	qcom,msm-mbhc-hphl-swh = <1>;
+	qcom,msm-mbhc-gnd-swh = <1>;
+};

From a00da5833f74fc5a92130129d3293b61624f2162 Mon Sep 17 00:00:00 2001
From: Zhou Song <quic_zhous@quicinc.com>
Date: Wed, 24 Apr 2024 17:23:07 +0800
Subject: [PATCH 2/2] ARM: dts: qcom: enable adsp loader

Enables adsp loader to trigger adsp ssr through
/sys/kernel/boot_adsp/ssr.
Remove property qcom,adsp-state to skip loading
adsp through /sys/kernel/boot_adsp/boot.

Change-Id: I298166bc079e60937247b2c130114e8d107b69c0
Signed-off-by: Zhou Song <quic_zhous@quicinc.com>
---
 sun-audio-overlay.dtsi | 4 ++++
 sun-audio.dtsi         | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/sun-audio-overlay.dtsi b/sun-audio-overlay.dtsi
index 62c4968a..81475d47 100644
--- a/sun-audio-overlay.dtsi
+++ b/sun-audio-overlay.dtsi
@@ -841,3 +841,7 @@
 		#clock-cells = <1>;
 	};
 };
+
+&adsp_loader {
+	status = "ok";
+};
diff --git a/sun-audio.dtsi b/sun-audio.dtsi
index 4890caf6..00498bcb 100644
--- a/sun-audio.dtsi
+++ b/sun-audio.dtsi
@@ -185,3 +185,7 @@
 	swr3 = "/soc/spf_core_platform/lpass-cdc/wsa2-macro@6AA0000/wsa2_swr_master";
 	swr4 = "/soc/spf_core_platform/lpass_bt_swr@6CA0000/bt_swr_mstr";
 };
+
+&adsp_loader {
+	/delete-property/ qcom,adsp-state;
+};