ARM: dts: msm: DT fixes for sdxprairie

Fix codec GPIO lines for sdxprairie so
codec will boot up properly. Add correct
child association for apr service. Fix
for setting the correct clk frequency
so codec will run properly.

Change-Id: I23b98b48d536d04eefaf15985a77d2db8a82f4d4
Signed-off-by: Josh Kirsch <jkirsch@codeaurora.org>

arch/arm64/boot/dts/qcom/sdxprairie-audio-overlay.dtsi

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -43,6 +43,7 @@
 	qcom,msm-mbhc-gnd-swh = <1>;
 	qcom,msm-mbhc-hs-mic-max-threshold-mv = <1700>;
 	qcom,msm-mbhc-hs-mic-min-threshold-mv = <50>;
+	qcom,cdc-ext-clk-rate = <19200000>;
 	qcom,tavil-mclk-clk-freq = <9600000>;
 
 	asoc-codec = <&stub_codec>;
@@ -62,24 +63,26 @@
 		interrupt-controller;
 		#interrupt-cells = <1>;
 		interrupt-parent = <&tlmm>;
-		qcom,gpio-connect = <&tlmm 90 0>;
+		qcom,gpio-connect = <&tlmm 96 0>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&wcd_intr_default>;
 	};
 
 	clock_audio_up: audio_ext_clk_up {
 		compatible = "qcom,audio-ref-clk";
-		qcom,audio-ref-clk-gpio = <&tlmm 62 0>;
-		qcom,codec-mclk-clk-freq = <9600000>;
+		qcom,codec-ext-clk-src = <AUDIO_LPASS_MCLK_3>;
+		qcom,codec-lpass-clk-id = <770>;
+		qcom,codec-lpass-ext-clk-freq = <9600000>;
+		qcom,use-pinctrl = <1>;
 		pinctrl-names = "sleep", "active";
 		pinctrl-0 = <&i2s_mclk_sleep>;
 		pinctrl-1 = <&i2s_mclk_active>;
 		#clock-cells = <1>;
 	};
 
-	wcd_rst_gpio: msm_cdc_pinctrl@86 {
+	wcd_rst_gpio: msm_cdc_pinctrl@92 {
 		compatible = "qcom,msm-cdc-pinctrl";
-		qcom,cdc-rst-n-gpio = <&tlmm 86 0>;
+		qcom,cdc-rst-n-gpio = <&tlmm 92 0>;
 		pinctrl-names = "aud_active", "aud_sleep";
 		pinctrl-0 = <&cdc_reset_active>;
 		pinctrl-1 = <&cdc_reset_sleep>;
@@ -99,7 +102,7 @@
 		qcom,wcd-rst-gpio-node = <&wcd_rst_gpio>;
 
 		clock-names = "wcd_clk";
-		clocks = <&clock_audio_up  AUDIO_LPASS_MCLK_1>;
+		clocks = <&clock_audio_up 0>;
 
 		cdc-vdd-buck-supply = <&pmxprairie_l6>;
 		qcom,cdc-vdd-buck-voltage = <1800000 1800000>;

arch/arm64/boot/dts/qcom/sdxprairie-pinctrl.dtsi

@@ -376,12 +376,12 @@
 		wcd9xxx_intr {
 			wcd_intr_default: wcd_intr_default{
 				mux {
-					pins = "gpio78";
+					pins = "gpio96";
 					function = "gpio";
 				};
 
 				config {
-					pins = "gpio78";
+					pins = "gpio96";
 					drive-strength = <2>; /* 2 mA */
 					bias-pull-down; /* pull down */
 					input-enable;
@@ -392,11 +392,11 @@
 		cdc_reset_ctrl {
 			cdc_reset_sleep: cdc_reset_sleep {
 				mux {
-					pins = "gpio79";
+					pins = "gpio92";
 					function = "gpio";
 				};
 				config {
-					pins = "gpio79";
+					pins = "gpio92";
 					drive-strength = <2>;
 					bias-disable;
 					output-low;
@@ -405,11 +405,11 @@
 
 			cdc_reset_active:cdc_reset_active {
 				mux {
-					pins = "gpio79";
+					pins = "gpio92";
 					function = "gpio";
 				};
 				config {
-					pins = "gpio79";
+					pins = "gpio92";
 					drive-strength = <8>;
 					bias-pull-down;
 					output-high;

arch/arm64/boot/dts/qcom/sdxprairie.dtsi

@@ -630,6 +630,11 @@
 						0x2000 3
 						0x4400 2>;
 			};
+
+			qcom,apr_tal_rpmsg {
+				qcom,glink-channels = "apr_audio_svc";
+				qcom,intents = <0x200 20>;
+			};
 		};
 	};