sw5100: Integrate LW 2.0 r00078.3aandroid-wear-13.0.0_r0.8android-wear-13.0.0_r0.6android-wear-13.0.0_r0.4android-wear-13.0.0_r0.3android-wear-13.0.0_r0.14android-wear-13.0.0_r0.12android-wear-13.0.0_r0.10android-msm-eos-android13-wear-kr3-pixel-watchandroid-msm-eos-5.15-tm-wear-kr3-pixel-watchandroid-msm-eos-5.15-tm-wear-kr3-dr-eos

Bug: 280095980
Change-Id: I570f7b9e4eca39db60b2de9019deef8cf8723c7c
Signed-off-by: Daniel Price <danielprice@google.com>

4 files changed, 55 insertions, 52 deletions

diff --git a/bengal-audio.dtsi b/bengal-audio.dtsi
index cfc36f7..8730701 100755
--- a/bengal-audio.dtsi
+++ b/bengal-audio.dtsi
@@ -51,6 +51,10 @@
 		qcom,iommu-dma-addr-pool = <0x10000000 0x10000000>;
 	};
 
+	msm_audio_ion_cma: qcom,msm-audio-ion-cma {
+		compatible = "qcom,msm-audio-ion-cma";
+	};
+
 	cdc_dmic01_gpios: cdc_dmic01_pinctrl {
 		compatible = "qcom,msm-cdc-pinctrl";
 		pinctrl-names = "aud_active", "aud_sleep";
diff --git a/lemans-audio.dtsi b/lemans-audio.dtsi
index bfd8784..4113e1e 100755
--- a/lemans-audio.dtsi
+++ b/lemans-audio.dtsi
@@ -9,58 +9,53 @@
 
 	spf_tdm_quat: qcom,spf-msm-dai-tdm-quat {
 		compatible = "qcom,msm-pcm-pinctrl";
-		pinctrl-names = "default", "sleep";
-		pinctrl-0 = <&quat_mi2s_sck_active &quat_mi2s_ws_active
-					&quat_mi2s_sd0_active &quat_mi2s_sd1_active
-					&quat_mi2s_sd2_active &quat_mi2s_sd3_active>;
-		pinctrl-1 = <&quat_mi2s_sck_sleep &quat_mi2s_ws_sleep
+		pinctrl-names = "default", "active";
+		pinctrl-0 = <&quat_mi2s_sck_sleep &quat_mi2s_ws_sleep
 					&quat_mi2s_sd0_sleep &quat_mi2s_sd1_sleep
 					&quat_mi2s_sd2_sleep &quat_mi2s_sd3_sleep>;
-		qcom,lpi-gpios;
+		pinctrl-1 = <&quat_mi2s_sck_active &quat_mi2s_ws_active
+					&quat_mi2s_sd0_active &quat_mi2s_sd1_active
+					&quat_mi2s_sd2_active &quat_mi2s_sd3_active>;
 		#gpio-cells = <0>;
 	};
 
 	spf_tdm_quin: qcom,spf-msm-dai-tdm-quin {
 		compatible = "qcom,msm-pcm-pinctrl";
-		pinctrl-names = "default", "sleep";
-		pinctrl-0 = <&lpi_i2s1_sck_active &lpi_i2s1_ws_active
-					&lpi_i2s1_sd0_active &lpi_i2s1_sd1_active>;
-		pinctrl-1 = <&lpi_i2s1_sck_sleep &lpi_i2s1_ws_sleep
+		pinctrl-names = "default", "active";
+		pinctrl-0 = <&lpi_i2s1_sck_sleep &lpi_i2s1_ws_sleep
 					&lpi_i2s1_sd0_sleep &lpi_i2s1_sd1_sleep>;
-		qcom,lpi-gpios;
+		pinctrl-1 = <&lpi_i2s1_sck_active &lpi_i2s1_ws_active
+					&lpi_i2s1_sd0_active &lpi_i2s1_sd1_active>;
 		#gpio-cells = <0>;
 	};
 
 	spf_tdm_sen: qcom,spf-msm-dai-tdm-sen {
 		compatible = "qcom,msm-pcm-pinctrl";
-		pinctrl-names = "default", "sleep";
-		pinctrl-0 = <&lpi_i2s2_sck_active &lpi_i2s2_ws_active
-					&lpi_i2s2_sd0_active &lpi_i2s2_sd1_active>;
-		pinctrl-1 = <&lpi_i2s2_sck_sleep &lpi_i2s2_ws_sleep
+		pinctrl-names = "default", "active";
+		pinctrl-0 = <&lpi_i2s2_sck_sleep &lpi_i2s2_ws_sleep
 					&lpi_i2s2_sd0_sleep &lpi_i2s2_sd1_sleep>;
-		qcom,lpi-gpios;
+		pinctrl-1 = <&lpi_i2s2_sck_active &lpi_i2s2_ws_active
+					&lpi_i2s2_sd0_active &lpi_i2s2_sd1_active>;
 		#gpio-cells = <0>;
 	};
 
 	spf_tdm_sep: qcom,spf-msm-dai-tdm-sep {
 		compatible = "qcom,msm-pcm-pinctrl";
-		pinctrl-names = "default", "sleep";
-		pinctrl-0 = <&lpi_i2s3_sck_active &lpi_i2s3_ws_active
-					&lpi_i2s3_sd0_active &lpi_i2s3_sd1_active>;
-		pinctrl-1 = <&lpi_i2s3_sck_sleep &lpi_i2s3_ws_sleep
+		pinctrl-names = "default", "active";
+		pinctrl-0 = <&lpi_i2s3_sck_sleep &lpi_i2s3_ws_sleep
 					&lpi_i2s3_sd0_sleep &lpi_i2s3_sd1_sleep>;
-		qcom,lpi-gpios;
+		pinctrl-1 = <&lpi_i2s3_sck_active &lpi_i2s3_ws_active
+					&lpi_i2s3_sd0_active &lpi_i2s3_sd1_active>;
 		#gpio-cells = <0>;
 	};
 
 	spf_tdm_oct: qcom,spf-msm-dai-tdm-oct {
 		compatible = "qcom,msm-pcm-pinctrl";
-		pinctrl-names = "default", "sleep";
-		pinctrl-0 = <&lpi_i2s4_sck_active &lpi_i2s4_ws_active
-					&lpi_i2s4_sd0_active &lpi_i2s4_sd1_active>;
-		pinctrl-1 = <&lpi_i2s4_sck_sleep &lpi_i2s4_ws_sleep
+		pinctrl-names = "default", "active";
+		pinctrl-0 = <&lpi_i2s4_sck_sleep &lpi_i2s4_ws_sleep
 					&lpi_i2s4_sd0_sleep &lpi_i2s4_sd1_sleep>;
-		qcom,lpi-gpios;
+		pinctrl-1 = <&lpi_i2s4_sck_active &lpi_i2s4_ws_active
+					&lpi_i2s4_sd0_active &lpi_i2s4_sd1_active>;
 		#gpio-cells = <0>;
 	};
 };
@@ -102,59 +97,59 @@
 
 	spf_tdm_sec: qcom,spf-msm-dai-tdm-sec {
 		compatible = "qcom,msm-pcm-pinctrl";
-		pinctrl-names = "default", "sleep";
-		pinctrl-0 = <&sec_tdm_sck_active &sec_tdm_ws_active
-					&sec_tdm_din_active &sec_tdm_dout_active>;
-		pinctrl-1 = <&sec_tdm_sck_sleep &sec_tdm_ws_sleep
+		pinctrl-names = "default", "active";
+		pinctrl-0 = <&sec_tdm_sck_sleep &sec_tdm_ws_sleep
 					&sec_tdm_din_sleep &sec_tdm_dout_sleep>;
+		pinctrl-1 = <&sec_tdm_sck_active &sec_tdm_ws_active
+					&sec_tdm_din_active &sec_tdm_dout_active>;
 		#gpio-cells = <0>;
 	};
 
 	spf_tdm_tert: qcom,spf-msm-dai-tdm-tert {
 		compatible = "qcom,msm-pcm-pinctrl";
-		pinctrl-names = "default", "sleep";
-		pinctrl-0 = <&tert_tdm_sck_active &tert_tdm_ws_active
-					&tert_tdm_din_active &tert_tdm_dout_active>;
-		pinctrl-1 = <&tert_tdm_sck_sleep &tert_tdm_ws_sleep
+		pinctrl-names = "default", "active";
+		pinctrl-0 = <&tert_tdm_sck_sleep &tert_tdm_ws_sleep
 					&tert_tdm_din_sleep &tert_tdm_dout_sleep>;
+		pinctrl-1 = <&tert_tdm_sck_active &tert_tdm_ws_active
+					&tert_tdm_din_active &tert_tdm_dout_active>;
 		#gpio-cells = <0>;
 	};
 
 	spf_tdm_hsif0: qcom,spf-msm-dai-tdm-hsif0 {
 		compatible = "qcom,msm-pcm-pinctrl";
-		pinctrl-names = "default", "sleep";
-		pinctrl-0 = <&hs0_i2s_sck_active &hs0_i2s_ws_active
-					&hs0_i2s_data0_active &hs0_i2s_data1_active>;
-		pinctrl-1 = <&hs0_i2s_sck_sleep &hs0_i2s_ws_sleep
+		pinctrl-names = "default", "active";
+		pinctrl-0 = <&hs0_i2s_sck_sleep &hs0_i2s_ws_sleep
 					&hs0_i2s_data0_sleep &hs0_i2s_data1_sleep>;
+		pinctrl-1 = <&hs0_i2s_sck_active &hs0_i2s_ws_active
+					&hs0_i2s_data0_active &hs0_i2s_data1_active>;
 		#gpio-cells = <0>;
 	};
 
 	spf_tdm_hsif1: qcom,spf-msm-dai-tdm-hsif1 {
 		compatible = "qcom,msm-pcm-pinctrl";
-		pinctrl-names = "default", "sleep";
-		pinctrl-0 = <&hs1_i2s_sck_active &hs1_i2s_ws_active
-					&hs1_i2s_data0_active &hs1_i2s_data1_active>;
-		pinctrl-1 = <&hs1_i2s_sck_sleep &hs1_i2s_ws_sleep
+		pinctrl-names = "default", "active";
+		pinctrl-0 = <&hs1_i2s_sck_sleep &hs1_i2s_ws_sleep
 					&hs1_i2s_data0_sleep &hs1_i2s_data1_sleep>;
+		pinctrl-1 = <&hs1_i2s_sck_active &hs1_i2s_ws_active
+					&hs1_i2s_data0_active &hs1_i2s_data1_active>;
 		#gpio-cells = <0>;
 	};
 
 	spf_tdm_hsif2: qcom,spf-msm-dai-tdm-hsif2 {
 		compatible = "qcom,msm-pcm-pinctrl";
-		pinctrl-names = "default", "sleep";
-		pinctrl-0 = <&hs2_i2s_sck_active &hs2_i2s_ws_active
-					&hs2_i2s_data0_active &hs2_i2s_data1_active>;
-		pinctrl-1 = <&hs2_i2s_sck_sleep &hs2_i2s_ws_sleep
+		pinctrl-names = "default", "active";
+		pinctrl-0 = <&hs2_i2s_sck_sleep &hs2_i2s_ws_sleep
 					&hs2_i2s_data0_sleep &hs2_i2s_data1_sleep>;
+		pinctrl-1 = <&hs2_i2s_sck_active &hs2_i2s_ws_active
+					&hs2_i2s_data0_active &hs2_i2s_data1_active>;
 		#gpio-cells = <0>;
 	};
 
 	spf_internal_mclk1: qcom,spf-msm-internal-mclk1 {
 		compatible = "qcom,msm-pcm-pinctrl";
-		pinctrl-names = "default", "sleep";
-		pinctrl-0 = <&audio_internal_mclk1_active>;
-		pinctrl-1 = <&audio_internal_mclk1_sleep>;
+		pinctrl-names = "default", "active";
+		pinctrl-0 = <&audio_internal_mclk1_sleep>;
+		pinctrl-1 = <&audio_internal_mclk1_active>;
 		#gpio-cells = <0>;
 	};
 
diff --git a/sa8155-audio.dtsi b/sa8155-audio.dtsi
index f39dbcf..4b0d973 100755
--- a/sa8155-audio.dtsi
+++ b/sa8155-audio.dtsi
@@ -640,6 +640,10 @@
 		dma-coherent;
 	};
 
+	spf_msm_audio_ion_cma: qcom,spf-msm-audio-ion-cma {
+		compatible = "qcom,msm-audio-ion-cma";
+	};
+
 	spf_tdm_pri_rx: qcom,spf-msm-dai-tdm-pri-rx {
 		compatible = "qcom,msm-pcm-pinctrl";
 		pinctrl-names = "default", "active";
diff --git a/sdxbaagha-audio-overlay.dtsi b/sdxbaagha-audio-overlay.dtsi
index e81d865..e04621d 100755
--- a/sdxbaagha-audio-overlay.dtsi
+++ b/sdxbaagha-audio-overlay.dtsi
@@ -50,7 +50,7 @@
 		interrupt-controller;
 		#interrupt-cells = <1>;
 		interrupt-parent = <&tlmm>;
-		qcom,gpio-connect = <&tlmm 75 0>;
+		qcom,gpio-connect = <&tlmm 48 0>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&wcd_intr_default>;
 	};
@@ -67,9 +67,9 @@
 		#clock-cells = <1>;
 	};
 
-	wcd_rst_gpio: msm_cdc_pinctrl@77 {
+	wcd_rst_gpio: msm_cdc_pinctrl@49 {
 		compatible = "qcom,msm-cdc-pinctrl";
-		qcom,cdc-rst-n-gpio = <&tlmm 77 0>;
+		qcom,cdc-rst-n-gpio = <&tlmm 49 0>;
 		pinctrl-names = "aud_active", "aud_sleep";
 		pinctrl-0 = <&cdc_reset_active>;
 		pinctrl-1 = <&cdc_reset_sleep>;