From c4cd4fae9d8e59d2c9a11f95de714f7eb6c53c6d Mon Sep 17 00:00:00 2001
From: Phani Kumar Uppalapati <quic_phaniu@quicinc.com>
Date: Tue, 14 May 2024 18:38:11 -0700
Subject: [PATCH] ARM: dts: qcom: Add QMP support for sun r2 devices

Add support for QMP mic on Sun r2 hamilton
MTP variants.

Change-Id: I71a33aa6955d54645ce9d6a5d9f7b4247a9eecef
Signed-off-by: Phani Kumar Uppalapati <quic_phaniu@quicinc.com>
---
 Kbuild                          |  1 +
 sun-audio-hamilton-mtp-v2.dts   | 21 +++++++++++++++++++++
 sun-audio-hamilton-mtp.dts      |  6 +++---
 sun-audio-hamilton-qmp-mtp.dtsi | 17 +++++++++++++++++
 4 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 sun-audio-hamilton-mtp-v2.dts
 create mode 100644 sun-audio-hamilton-qmp-mtp.dtsi

diff --git a/Kbuild b/Kbuild
index 1ba1bdcd..2f34da17 100644
--- a/Kbuild
+++ b/Kbuild
@@ -29,6 +29,7 @@ dtbo-y += sun-audio.dtbo \
                 sun-audio-rcm.dtbo \
                 sun-audio-hamilton-rcm.dtbo \
                 sun-audio-hamilton-cdp.dtbo \
+                sun-audio-hamilton-mtp-v2.dtbo \
                 sun-audio-hamilton-mtp.dtbo
 endif
 
diff --git a/sun-audio-hamilton-mtp-v2.dts b/sun-audio-hamilton-mtp-v2.dts
new file mode 100644
index 00000000..9e0e074a
--- /dev/null
+++ b/sun-audio-hamilton-mtp-v2.dts
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+/*This is MTP v2 with Hamilton + V8/V6 wlan*/
+
+#include "sun-audio-hamilton-qmp-mtp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Sun MTP ST54L NFC";
+	compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", "qcom,mtp";
+	qcom,msm-id = <618 0x20000>, <639 0x20000>,
+			<0x100026a 0x20000>,
+			<0x100027f 0x20000>;
+	qcom,board-id = <0x20008 0>, <0x50008 0>;
+};
+
diff --git a/sun-audio-hamilton-mtp.dts b/sun-audio-hamilton-mtp.dts
index 56cdbfea..7cafb7e8 100644
--- a/sun-audio-hamilton-mtp.dts
+++ b/sun-audio-hamilton-mtp.dts
@@ -13,9 +13,9 @@
 / {
 	model = "Qualcomm Technologies, Inc. Sun MTP ST54L NFC";
 	compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", "qcom,mtp";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
-			<0x100026a 0x10000>, <0x100026a 0x20000>,
-			<0x100027f 0x10000>, <0x100027f 0x20000>;
+	qcom,msm-id = <618 0x10000>, <639 0x10000>,
+			<0x100026a 0x10000>,
+			<0x100027f 0x10000>;
 	qcom,board-id = <0x20008 0>, <0x50008 0>;
 };
 
diff --git a/sun-audio-hamilton-qmp-mtp.dtsi b/sun-audio-hamilton-qmp-mtp.dtsi
new file mode 100644
index 00000000..d5f99035
--- /dev/null
+++ b/sun-audio-hamilton-qmp-mtp.dtsi
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include "sun-audio-mtp-qmp.dtsi"
+
+&lpass_bt_swr {
+	status = "disabled";
+};
+
+&sun_snd {
+	qcom,model = "sun-mtp-wsa883x_qmp-snd-card";
+	qcom,msm_audio_ssr_devs = <&audio_gpr>, <&lpi_tlmm>,
+				<&lpass_cdc>;
+};
+