From 66c4d84c0635504e66061707ff8a4da15a4c20da Mon Sep 17 00:00:00 2001
From: "Vangala, Amarnath" <avangala@qti.qualcomm.com>
Date: Mon, 27 Jul 2020 08:57:18 +0530
Subject: [PATCH] ARM: dts: msm: cdp and usb aatc changes for holi

Update WSA reset pin for CDP.
Enable AATC for the USBC CDT variant.
Include holi-audio-overlay.dtsi in base files.

Change-Id: I77a0bda20b0081b88748ade0b10d9d61d1d3d100
---
 qcom/holi-audio-overlay.dtsi | 8 ++++----
 qcom/holi-cdp-overlay.dts    | 5 +++++
 qcom/holi-cdp.dtsi           | 1 +
 qcom/holi-mtp-usbc.dtsi      | 7 +++++++
 qcom/holi-mtp.dtsi           | 1 +
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/qcom/holi-audio-overlay.dtsi b/qcom/holi-audio-overlay.dtsi
index f3c81815520a..1302eb561531 100644
--- a/qcom/holi-audio-overlay.dtsi
+++ b/qcom/holi-audio-overlay.dtsi
@@ -41,8 +41,8 @@
 			qcom,mipi-sdw-block-packing-mode = <1>;
 			swrm-io-base = <0xA740000 0x0>;
 			interrupts-extended =
-				<&intc GIC_SPI 296 IRQ_TYPE_LEVEL_HIGH>,
-				<&intc GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
+				<&wakegic 5 IRQ_TYPE_LEVEL_HIGH>,
+				<&wakegic 66 IRQ_TYPE_LEVEL_HIGH>;
 			interrupt-names = "swr_master_irq", "swr_wake_irq";
 			qcom,swr-num-ports = <3>;
 			qcom,swr-port-mapping = <1 SWRM_TX1_CH1 0x1>,
@@ -214,7 +214,7 @@
 
 		cdc-vdd-mic-bias-supply = <&BOB>;
 		qcom,cdc-vdd-mic-bias-voltage = <3296000 3296000>;
-		qcom,cdc-vdd-mic-bias-current = <i45000>;
+		qcom,cdc-vdd-mic-bias-current = <45000>;
 
 		qcom,cdc-micbias1-mv = <1800>;
 		qcom,cdc-micbias2-mv = <1800>;
@@ -272,7 +272,7 @@
 		"VA DMIC0", "VA MIC BIAS1",
 		"VA DMIC1", "VA MIC BIAS1",
 		"VA DMIC2", "VA MIC BIAS3",
-		"VA DMIC3", "VA MIC BIAS3",
+		"VA DMIC3", "VA MIC BIAS3";
 	qcom,msm-mbhc-hphl-swh = <1>;
 	qcom,msm-mbhc-gnd-swh = <1>;
 	qcom,cdc-dmic01-gpios = <&cdc_dmic01_gpios>;
diff --git a/qcom/holi-cdp-overlay.dts b/qcom/holi-cdp-overlay.dts
index b166093b8edf..bcfd73d4422b 100644
--- a/qcom/holi-cdp-overlay.dts
+++ b/qcom/holi-cdp-overlay.dts
@@ -9,3 +9,8 @@
 	qcom,msm-id = <454 0x10000>;
 	qcom,board-id = <1 0>;
 };
+
+&wsa881x_analog_reset_gpio {
+	pinctrl-0 = <&spkr_1_sd_n_active>;
+	pinctrl-1 = <&spkr_1_sd_n_sleep>;
+};
diff --git a/qcom/holi-cdp.dtsi b/qcom/holi-cdp.dtsi
index 9cc872ccb886..9606af0aac41 100644
--- a/qcom/holi-cdp.dtsi
+++ b/qcom/holi-cdp.dtsi
@@ -1,3 +1,4 @@
+#include "holi-audio-overlay.dtsi"
 
 &ufsphy_mem {
 		compatible = "qcom,ufs-phy-qmp-v3";
diff --git a/qcom/holi-mtp-usbc.dtsi b/qcom/holi-mtp-usbc.dtsi
index 9cc872ccb886..5eab56b35c73 100644
--- a/qcom/holi-mtp-usbc.dtsi
+++ b/qcom/holi-mtp-usbc.dtsi
@@ -1,3 +1,4 @@
+#include "holi-audio-overlay.dtsi"
 
 &ufsphy_mem {
 		compatible = "qcom,ufs-phy-qmp-v3";
@@ -29,3 +30,9 @@
 
 		status = "ok";
 };
+
+&holi_snd {
+	qcom,msm-mbhc-usbc-audio-supported = <1>;
+	qcom,msm-mbhc-hphl-swh = <0>;
+	qcom,msm-mbhc-gnd-swh = <0>;
+};
diff --git a/qcom/holi-mtp.dtsi b/qcom/holi-mtp.dtsi
index 9cc872ccb886..9606af0aac41 100644
--- a/qcom/holi-mtp.dtsi
+++ b/qcom/holi-mtp.dtsi
@@ -1,3 +1,4 @@
+#include "holi-audio-overlay.dtsi"
 
 &ufsphy_mem {
 		compatible = "qcom,ufs-phy-qmp-v3";